aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch')
-rw-r--r--patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
new file mode 100644
index 0000000000..83aebd18e6
--- /dev/null
+++ b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Thu, 2 Apr 2020 19:31:16 -0400
+Subject: [PATCH] Dead Player's shouldn't be able to move
+
+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 d308c671ec1c4440777bccf1609ceca6670b98a8..0960e5ecc25fad3eb46a871c2749dd176b812460 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -1172,7 +1172,7 @@ public abstract class Player extends LivingEntity {
+
+ @Override
+ protected boolean isImmobile() {
+- return super.isImmobile() || this.isSleeping();
++ return super.isImmobile() || this.isSleeping() || this.isRemoved() || !valid; // Paper - player's who are dead or not in a world shouldn't move...
+ }
+
+ @Override