Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 05:11:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing event call for entity teleport API

Browse Source
This commit is contained in:
booky10 2023-11-12 05:09:47 +01:00
parent c29a8dc160
commit 4853ebd729
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false; 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 this entity is riding another entity, we must dismount before teleporting.
if (dismount) this.entity.stopRiding(); // Paper - Teleport passenger API if (dismount) this.entity.stopRiding(); // Paper - Teleport passenger API