--- a/net/minecraft/world/entity/monster/EntityShulker.java +++ b/net/minecraft/world/entity/monster/EntityShulker.java @@ -58,6 +58,12 @@ import net.minecraft.world.phys.Vec3D; import org.joml.Vector3f; +// CraftBukkit start +import org.bukkit.craftbukkit.util.CraftLocation; +import org.bukkit.event.entity.EntityTeleportEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; +// CraftBukkit end + public class EntityShulker extends EntityGolem implements VariantHolder>, IMonster { private static final UUID COVERED_ARMOR_MODIFIER_UUID = UUID.fromString("7E0292F2-9434-48D5-A29F-9583AF7DF27F"); @@ -401,6 +407,14 @@ EnumDirection enumdirection = this.findAttachableSurface(blockposition1); if (enumdirection != null) { + // CraftBukkit start + EntityTeleportEvent teleportEvent = CraftEventFactory.callEntityTeleportEvent(this, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); + if (teleportEvent.isCancelled()) { + return false; + } else { + blockposition1 = CraftLocation.toBlockPosition(teleportEvent.getTo()); + } + // CraftBukkit end this.unRide(); this.setAttachFace(enumdirection); this.playSound(SoundEffects.SHULKER_TELEPORT, 1.0F, 1.0F); @@ -471,7 +485,7 @@ 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 } }