From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: booky10 Date: Sun, 12 Nov 2023 05:09:47 +0100 Subject: [PATCH] Fix missing event call for entity teleport API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 0349d9b6ad12e0a426cb1307be8633240b7426fe..2121bcf4517bf5b2aa595479720c8ed95d65b62b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -255,6 +255,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return false; } + // Paper start - fix teleport event not being called + org.bukkit.event.entity.EntityTeleportEvent event = new org.bukkit.event.entity.EntityTeleportEvent( + this, this.getLocation(), location); + // cancelling the event is handled differently for players and entities, + // entities just stop teleporting, players will still teleport to the "from" location of the event + if (!event.callEvent() || event.getTo() == null) { + return false; + } + location = event.getTo(); + // Paper end + // If this entity is riding another entity, we must dismount before teleporting. if (dismount) this.entity.stopRiding(); // Paper - Teleport passenger API