mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
34 lines
2 KiB
Diff
34 lines
2 KiB
Diff
--- a/net/minecraft/server/PathfinderGoalFollowOwner.java
|
|
+++ b/net/minecraft/server/PathfinderGoalFollowOwner.java
|
|
@@ -1,5 +1,11 @@
|
|
package net.minecraft.server;
|
|
|
|
+// 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 {
|
|
|
|
private final EntityTameableAnimal b;
|
|
@@ -73,7 +79,18 @@
|
|
for (int l = 0; l <= 4; ++l) {
|
|
for (int i1 = 0; i1 <= 4; ++i1) {
|
|
if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.a(i, j, k, l, i1)) {
|
|
- this.b.setPositionRotation((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.b.yaw, this.b.pitch);
|
|
+ // CraftBukkit start
|
|
+ CraftEntity entity = this.b.getBukkitEntity();
|
|
+ Location to = new Location(entity.getWorld(), (double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.b.yaw, this.b.pitch);
|
|
+ EntityTeleportEvent event = new EntityTeleportEvent(entity, entity.getLocation(), to);
|
|
+ this.b.world.getServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ to = event.getTo();
|
|
+
|
|
+ this.b.setPositionRotation(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch());
|
|
+ // CraftBukkit end
|
|
this.e.q();
|
|
return;
|
|
}
|