Skip to content

Fix EntityTeleportEvent triggering twice #12346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix EntityTeleportEvent triggering twice #12346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3636a97
fix EntityTeleportEvent triggering twice
orang3i Mar 27, 2025
12bb860
Fix CraftEntity#teleport for Cross world teleports and null worlds
orang3i Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions paper-server/patches/sources/net/minecraft/server/commands/TeleportCommand.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/commands/TeleportCommand.java
+++ b/net/minecraft/server/commands/TeleportCommand.java
@@ -290,7 +_,31 @@
@@ -290,7 +_,16 @@
float f1 = relatives.contains(Relative.X_ROT) ? xRot - target.getXRot() : xRot;
float f2 = Mth.wrapDegrees(f);
float f3 = Mth.wrapDegrees(f1);
Expand All @@ -10,21 +10,6 @@
+ if (target instanceof final net.minecraft.server.level.ServerPlayer player) {
+ result = player.teleportTo(level, d, d1, d2, relatives, f2, f3, true, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND);
+ } else {
+ org.bukkit.Location to = new org.bukkit.Location(level.getWorld(), d, d1, d2, f2, f3);
+ org.bukkit.event.entity.EntityTeleportEvent event = new org.bukkit.event.entity.EntityTeleportEvent(target.getBukkitEntity(), target.getBukkitEntity().getLocation(), to);
+ level.getCraftServer().getPluginManager().callEvent(event);
+ if (event.isCancelled() || event.getTo() == null) { // Paper
+ return;
+ }
+ to = event.getTo(); // Paper - actually track new location
+
+ d = to.getX();
+ d1 = to.getY();
+ d2 = to.getZ();
+ f2 = to.getYaw();
+ f3 = to.getPitch();
+ level = ((org.bukkit.craftbukkit.CraftWorld) to.getWorld()).getHandle();
+
+ result = target.teleportTo(level, d, d1, d2, relatives, f2, f3, true);
+ }
+
Expand Down
19 changes: 12 additions & 7 deletions paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,19 @@ public boolean teleport(Location location, TeleportCause cause, io.papermc.paper
}

// 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;
if (location.getWorld() == this.getWorld() || location.getWorld() == null) { // Don't call event for cross world teleports
if (location.getWorld() == null) {
location.setWorld(this.getWorld());
}
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();
}
location = event.getTo();
// Paper end

// If this entity is riding another entity, we must dismount before teleporting.
Expand Down