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

42 lines
2 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
2021-06-11 15:00:00 +10:00
@@ -57,6 +57,12 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.AxisAlignedBB;
import net.minecraft.world.phys.Vec3D;
2021-03-09 08:47:33 +11:00
+// CraftBukkit start
2021-03-16 09:00:00 +11:00
+import net.minecraft.server.level.WorldServer;
+import org.bukkit.Location;
+import org.bukkit.event.entity.EntityTeleportEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
public class EntityShulker extends EntityGolem implements IMonster {
2021-06-11 15:00:00 +10:00
private static final UUID COVERED_ARMOR_MODIFIER_UUID = UUID.fromString("7E0292F2-9434-48D5-A29F-9583AF7DF27F");
@@ -405,6 +411,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
2021-06-11 15:00:00 +10:00
+ EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), new Location(this.level.getWorld(), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()));
+ this.level.getCraftServer().getPluginManager().callEvent(teleport);
2020-06-25 10:00:00 +10:00
+ if (!teleport.isCancelled()) {
+ Location to = teleport.getTo();
+ blockposition1 = new BlockPosition(to.getX(), to.getY(), to.getZ());
+ } 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);
2022-06-08 02:00:00 +10:00
@@ -478,7 +494,7 @@
2019-12-11 09:00:00 +11:00
}
2021-11-22 09:00:00 +11:00
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
}
}
2021-06-11 15:00:00 +10:00
}