3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-22 14:28:09 +01:00
Paper/nms-patches/EntityShulker.patch

51 Zeilen
2.4 KiB
Diff

--- a/net/minecraft/server/EntityShulker.java
+++ b/net/minecraft/server/EntityShulker.java
2019-04-23 04:00:00 +02:00
@@ -6,6 +6,10 @@
2018-12-25 22:00:00 +01:00
import java.util.Optional;
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 {
2019-04-23 04:00:00 +02:00
@@ -46,7 +50,7 @@
this.goalSelector.a(4, new EntityShulker.a());
this.goalSelector.a(7, new EntityShulker.e());
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
- this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
this.targetSelector.a(2, new EntityShulker.d(this));
this.targetSelector.a(3, new EntityShulker.c(this));
}
2019-12-10 23:00:00 +01:00
@@ -300,8 +304,17 @@
EnumDirection enumdirection = aenumdirection[k];
2019-04-23 04:00:00 +02:00
if (this.world.a(blockposition1.shift(enumdirection), (Entity) this)) {
- this.datawatcher.set(EntityShulker.b, 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());
+
2019-04-23 04:00:00 +02:00
+ this.datawatcher.set(EntityShulker.b, enumdirection);
+ flag = true;
+ }
+ // CraftBukkit end
break;
}
}
2019-12-10 23:00:00 +01:00
@@ -344,6 +357,7 @@
}
this.f((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D);
2019-04-23 04:00:00 +02:00
+ if (valid) ((WorldServer) world).chunkCheck(this); // CraftBukkit
2019-12-10 23:00:00 +01:00
}
}