aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
diff options
context:
space:
mode:
authorOwen <[email protected]>2024-03-03 17:05:34 -0500
committerGitHub <[email protected]>2024-03-03 17:05:34 -0500
commit89d51d5f298cd25d6f44388970596c6780b5664b (patch)
tree07f41f4ce7bc466ea5e35faa2575d0ec6f6c4a76 /patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
parentb21eb4d9a4d0d0bea857675e2186657592df548e (diff)
downloadPaper-89d51d5f298cd25d6f44388970596c6780b5664b.tar.gz
Paper-89d51d5f298cd25d6f44388970596c6780b5664b.zip
Allow enabling sand duping (#10191)
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
Diffstat (limited to 'patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch')
-rw-r--r--patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
new file mode 100644
index 0000000000..1d122c2f15
--- /dev/null
+++ b/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: booky10 <[email protected]>
+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 089eb25d532990773161063658f123f1e5bef2b3..9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -256,6 +256,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
+