36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.java
|
|
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.java
|
|
@@ -14,6 +14,12 @@
|
|
import net.minecraft.world.level.pathfinder.PathType;
|
|
import net.minecraft.world.level.pathfinder.PathfinderNormal;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.craftbukkit.entity.CraftEntity;
|
|
+import org.bukkit.event.entity.EntityTeleportEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class PathfinderGoalFollowOwner extends PathfinderGoal {
|
|
|
|
public static final int TELEPORT_WHEN_DISTANCE_IS = 12;
|
|
@@ -120,7 +126,18 @@
|
|
} else if (!this.canTeleportTo(new BlockPosition(i, j, k))) {
|
|
return false;
|
|
} else {
|
|
- this.tamable.moveTo((double) i + 0.5D, (double) j, (double) k + 0.5D, this.tamable.getYRot(), this.tamable.getXRot());
|
|
+ // CraftBukkit start
|
|
+ CraftEntity entity = this.tamable.getBukkitEntity();
|
|
+ Location to = new Location(entity.getWorld(), (double) i + 0.5D, (double) j, (double) k + 0.5D, this.tamable.getYRot(), this.tamable.getXRot());
|
|
+ EntityTeleportEvent event = new EntityTeleportEvent(entity, entity.getLocation(), to);
|
|
+ this.tamable.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ to = event.getTo();
|
|
+
|
|
+ this.tamable.moveTo(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch());
|
|
+ // CraftBukkit end
|
|
this.navigation.stop();
|
|
return true;
|
|
}
|