diff options
author | Daniel Ennis <[email protected]> | 2020-11-02 21:22:15 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2020-11-02 20:22:15 -0600 |
commit | e792da723af35098461a4721f59fe6a6276d2aa1 (patch) | |
tree | 508fcf48f42da4fa0cfb2884f3f8d105b283412c /Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch | |
parent | 4bcebab1675d88d144d2896734f4a940345f76c2 (diff) | |
download | Paper-e792da723af35098461a4721f59fe6a6276d2aa1.tar.gz Paper-e792da723af35098461a4721f59fe6a6276d2aa1.zip |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
30885166 Update to Minecraft 1.16.4
CraftBukkit Changes:
3af81c71 Update to Minecraft 1.16.4
Spigot Changes:
f011ca24 Update to Minecraft 1.16.4
Co-authored-by: Mariell Hoversholm <[email protected]>
Diffstat (limited to 'Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch')
-rw-r--r-- | Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch new file mode 100644 index 0000000000..22db63d4f6 --- /dev/null +++ b/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch @@ -0,0 +1,21 @@ +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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index 1d0345f904de6061e5cfee3ab7c2dbfd94e3fa9e..93877b45f380e57f2dc9656463e333ef422a4b95 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -1309,6 +1309,10 @@ public class PlayerConnection implements PacketListenerPlayIn { + } + + private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) { ++ if (player.dead) { ++ LOGGER.info("Attempt to teleport dead player {} restricted", player.getName()); ++ return; ++ } + // CraftBukkit start + if (Float.isNaN(f)) { + f = 0; |