Paper/nms-patches/EntityShulker.patch

43 lines
1.9 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/EntityShulker.java
+++ b/net/minecraft/server/EntityShulker.java
@@ -6,6 +6,10 @@
import java.util.List;
import java.util.UUID;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.event.entity.EntityTeleportEvent;
+// CraftBukkit end
public class EntityShulker extends EntityGolem implements IMonster {
@@ -112,7 +116,7 @@
this.datawatcher.set(EntityShulker.b, Optional.of(new BlockPosition(i, j, k)));
} else {
- this.datawatcher.set(EntityShulker.b, Optional.absent());
+ this.datawatcher.set(EntityShulker.b, Optional.<BlockPosition>absent());
}
}
@@ -331,8 +335,17 @@
EnumDirection enumdirection = aenumdirection[k];
if (this.world.d(blockposition1.shift(enumdirection), false)) {
- this.datawatcher.set(EntityShulker.a, enumdirection);
- flag = true;
+ // CraftBukkit start
+ EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), new Location(this.world.getWorld(), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()));
+ this.world.getServer().getPluginManager().callEvent(teleport);
+ if (!teleport.isCancelled()) {
+ Location to = teleport.getTo();
+ blockposition1 = new BlockPosition(to.getX(), to.getY(), to.getZ());
+
+ this.datawatcher.set(EntityShulker.a, enumdirection);
+ flag = true;
+ }
+ // CraftBukkit end
break;
}
}