mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 03:43:40 +01:00
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
|
--- a/net/minecraft/world/entity/TamableAnimal.java
|
||
|
+++ b/net/minecraft/world/entity/TamableAnimal.java
|
||
|
@@ -27,6 +27,11 @@
|
||
|
import net.minecraft.world.level.pathfinder.PathType;
|
||
|
import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
|
||
|
import net.minecraft.world.scores.PlayerTeam;
|
||
|
+// CraftBukkit start
|
||
|
+import org.bukkit.Location;
|
||
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
||
|
+import org.bukkit.event.entity.EntityTeleportEvent;
|
||
|
+// CraftBukkit end
|
||
|
|
||
|
public abstract class TamableAnimal extends Animal implements OwnableEntity {
|
||
|
|
||
|
@@ -295,7 +300,14 @@
|
||
|
if (!this.canTeleportTo(new BlockPos(x, y, z))) {
|
||
|
return false;
|
||
|
} else {
|
||
|
- this.moveTo((double) x + 0.5D, (double) y, (double) z + 0.5D, this.getYRot(), this.getXRot());
|
||
|
+ // CraftBukkit start
|
||
|
+ EntityTeleportEvent event = CraftEventFactory.callEntityTeleportEvent(this, (double) x + 0.5D, (double) y, (double) z + 0.5D);
|
||
|
+ if (event.isCancelled()) {
|
||
|
+ return false;
|
||
|
+ }
|
||
|
+ Location to = event.getTo();
|
||
|
+ this.moveTo(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch());
|
||
|
+ // CraftBukkit end
|
||
|
this.navigation.stop();
|
||
|
return true;
|
||
|
}
|