aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0400-Prevent-teleporting-dead-entities.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0400-Prevent-teleporting-dead-entities.patch')
-rw-r--r--patches/server/0400-Prevent-teleporting-dead-entities.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/server/0400-Prevent-teleporting-dead-entities.patch b/patches/server/0400-Prevent-teleporting-dead-entities.patch
new file mode 100644
index 0000000000..bce03a0bd0
--- /dev/null
+++ b/patches/server/0400-Prevent-teleporting-dead-entities.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Tue, 3 Mar 2020 05:26:40 +0000
+Subject: [PATCH] Prevent teleporting dead entities
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 77cc62cc942687a40371741904525301a4ed5240..bbed54d5a0e3c363614d694950688f8edc02841d 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1632,6 +1632,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ }
+
+ public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) {
++ // Paper start
++ if (player.isRemoved()) {
++ LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
++ if (server.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Attempt to teleport removed player");
++ return;
++ }
++ // Paper end
+ // CraftBukkit start
+ if (Float.isNaN(f)) {
+ f = 0;