craftbukkit/nms-patches/PathfinderGoalFollowOwner.patch

36 lines
1.4 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/PathfinderGoalFollowOwner.java
+++ b/net/minecraft/server/PathfinderGoalFollowOwner.java
2021-03-09 08:47:33 +11:00
@@ -2,6 +2,12 @@
2019-04-23 12:00:00 +10:00
import java.util.EnumSet;
2021-03-09 08:47:33 +11:00
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.event.entity.EntityTeleportEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
public class PathfinderGoalFollowOwner extends PathfinderGoal {
2021-03-09 08:47:33 +11:00
private final EntityTameableAnimal a;
@@ -104,7 +110,18 @@
2019-12-11 09:00:00 +11:00
} else if (!this.a(new BlockPosition(i, j, k))) {
return false;
} else {
2020-06-25 10:00:00 +10:00
- this.a.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, this.a.yaw, this.a.pitch);
2019-12-11 09:00:00 +11:00
+ // CraftBukkit start
+ CraftEntity entity = this.a.getBukkitEntity();
2020-06-25 10:00:00 +10:00
+ Location to = new Location(entity.getWorld(), (double) i + 0.5D, (double) j, (double) k + 0.5D, this.a.yaw, this.a.pitch);
2019-12-11 09:00:00 +11:00
+ EntityTeleportEvent event = new EntityTeleportEvent(entity, entity.getLocation(), to);
+ this.a.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return false;
+ }
+ to = event.getTo();
+
2019-12-11 09:00:00 +11:00
+ this.a.setPositionRotation(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch());
+ // CraftBukkit end
this.e.o();
return true;
}