mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
50 lines
2.5 KiB
Diff
50 lines
2.5 KiB
Diff
--- a/net/minecraft/world/entity/monster/EntityShulker.java
|
|
+++ b/net/minecraft/world/entity/monster/EntityShulker.java
|
|
@@ -57,6 +57,12 @@
|
|
import net.minecraft.world.phys.AxisAlignedBB;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.server.level.WorldServer;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.event.entity.EntityTeleportEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityShulker extends EntityGolem implements IMonster {
|
|
|
|
private static final UUID COVERED_ARMOR_MODIFIER_UUID = UUID.fromString("7E0292F2-9434-48D5-A29F-9583AF7DF27F");
|
|
@@ -95,7 +101,7 @@
|
|
this.goalSelector.a(4, new EntityShulker.a());
|
|
this.goalSelector.a(7, new EntityShulker.f());
|
|
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
|
|
- this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{this.getClass()})).a());
|
|
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{this.getClass()})).a(new Class[0])); // CraftBukkit - decompile error
|
|
this.targetSelector.a(2, new EntityShulker.e(this));
|
|
this.targetSelector.a(3, new EntityShulker.c(this));
|
|
}
|
|
@@ -405,6 +411,16 @@
|
|
EnumDirection enumdirection = this.g(blockposition1);
|
|
|
|
if (enumdirection != null) {
|
|
+ // CraftBukkit start
|
|
+ EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), new Location(this.level.getWorld(), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()));
|
|
+ this.level.getServer().getPluginManager().callEvent(teleport);
|
|
+ if (!teleport.isCancelled()) {
|
|
+ Location to = teleport.getTo();
|
|
+ blockposition1 = new BlockPosition(to.getX(), to.getY(), to.getZ());
|
|
+ } else {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.decouple();
|
|
this.setAttachFace(enumdirection);
|
|
this.playSound(SoundEffects.SHULKER_TELEPORT, 1.0F, 1.0F);
|
|
@@ -477,7 +493,7 @@
|
|
}
|
|
|
|
entityshulker.d(vec3d);
|
|
- this.level.addEntity(entityshulker);
|
|
+ this.level.addEntity(entityshulker, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - the mysteries of life
|
|
}
|
|
}
|
|
}
|