craftbukkit/nms-patches/net/minecraft/world/entity/monster/EntityShulker.patch

42 lines
2.1 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/monster/EntityShulker.java
+++ b/net/minecraft/world/entity/monster/EntityShulker.java
2023-03-15 03:30:00 +11:00
@@ -60,6 +60,12 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.Vec3D;
2022-12-08 03:00:00 +11:00
import org.joml.Vector3f;
2021-03-09 08:47:33 +11:00
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.util.CraftLocation;
+import org.bukkit.event.entity.EntityTeleportEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
2022-12-08 03:00:00 +11:00
public class EntityShulker extends EntityGolem implements VariantHolder<Optional<EnumColor>>, IMonster {
2021-06-11 15:00:00 +10:00
private static final UUID COVERED_ARMOR_MODIFIER_UUID = UUID.fromString("7E0292F2-9434-48D5-A29F-9583AF7DF27F");
2023-03-15 03:30:00 +11:00
@@ -408,6 +414,16 @@
2021-11-22 09:00:00 +11:00
EnumDirection enumdirection = this.findAttachableSurface(blockposition1);
2020-06-25 10:00:00 +10:00
if (enumdirection != null) {
+ // CraftBukkit start
+ EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), CraftLocation.toBukkit(blockposition1, this.level.getWorld()));
+ this.level.getCraftServer().getPluginManager().callEvent(teleport);
2020-06-25 10:00:00 +10:00
+ if (!teleport.isCancelled()) {
+ Location to = teleport.getTo();
2023-03-15 03:30:00 +11:00
+ blockposition1 = BlockPosition.containing(to.getX(), to.getY(), to.getZ());
2020-06-25 10:00:00 +10:00
+ } else {
+ return false;
+ }
+ // CraftBukkit end
2021-11-22 09:00:00 +11:00
this.unRide();
2021-06-11 15:00:00 +10:00
this.setAttachFace(enumdirection);
this.playSound(SoundEffects.SHULKER_TELEPORT, 1.0F, 1.0F);
2023-03-15 03:30:00 +11:00
@@ -478,7 +494,7 @@
2022-12-08 03:00:00 +11:00
if (entityshulker != null) {
entityshulker.setVariant(this.getVariant());
entityshulker.moveTo(vec3d);
- this.level.addFreshEntity(entityshulker);
+ this.level.addFreshEntity(entityshulker, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - the mysteries of life
2019-12-11 09:00:00 +11:00
}
}