aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-02-23 14:37:33 +0100
committerGitHub <[email protected]>2024-02-23 14:37:33 +0100
commit71c84c8132a463ca26978b852bbbf33ae42cd4ce (patch)
treebbdde5e8056d16ba6778e56165db39b1f6d44468 /patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
parent3ea95efdebba7254e842dec66214f71de4721993 (diff)
downloadPaper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.tar.gz
Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear 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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
Diffstat (limited to 'patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch')
-rw-r--r--patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 8f01e2761d..78095e6dba 100644
--- a/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,10 +7,10 @@ This fixes a lot of game state issues where packets were delayed for processing
due to 1.15's new queue but processed while dead.
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6ab6f520f2ccb60646660cb2990c5b91a0e91909..d00d6cf28212ed72f49953a198caa447aefc138c 100644
+index 3c3c953f05c18279d3245fe6bc8afef83cd62cd1..603e003fbd39870a0e249151885b3b8f3e120afe 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1152,7 +1152,7 @@ public abstract class Player extends LivingEntity {
+@@ -1153,7 +1153,7 @@ public abstract class Player extends LivingEntity {
@Override
protected boolean isImmobile() {