2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
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
|
2024-12-03 19:54:10 +01:00
|
|
|
index 9f984834f3da2582f21172f2d52783ad3ff5c46d..e9e0a3d0958b309ca17322b11a6612be59ca41a6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2024-12-03 19:21:12 +01:00
|
|
|
@@ -1625,6 +1625,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-10-23 16:04:01 +02:00
|
|
|
public void internalTeleport(PositionMoveRotation positionmoverotation, Set<Relative> set) {
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper start - Prevent teleporting dead entities
|
2021-06-14 00:05:18 +02:00
|
|
|
+ if (player.isRemoved()) {
|
|
|
|
+ LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
|
2021-12-29 16:05:23 +01:00
|
|
|
+ if (server.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Attempt to teleport removed player");
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper end - Prevent teleporting dead entities
|
2024-10-23 16:04:01 +02:00
|
|
|
if (Float.isNaN(positionmoverotation.yRot())) {
|
|
|
|
positionmoverotation = new PositionMoveRotation(positionmoverotation.position(), positionmoverotation.deltaMovement(), 0, positionmoverotation.xRot());
|
|
|
|
}
|