2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-02 23:42:20 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
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/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
2020-06-26 12:04:38 +00:00
|
|
|
index 5ef91da9733fd9276e7bd819a11a0548e01b17f0..2db0cfd6c32c58beadc71d4be487776500c1b8a6 100644
|
2020-04-02 23:42:20 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
2020-06-26 01:53:21 +00:00
|
|
|
@@ -952,7 +952,7 @@ public abstract class EntityHuman extends EntityLiving {
|
2020-04-02 23:42:20 +00:00
|
|
|
|
|
|
|
@Override
|
|
|
|
protected boolean isFrozen() {
|
|
|
|
- return super.isFrozen() || this.isSleeping();
|
|
|
|
+ return super.isFrozen() || this.isSleeping() || dead || !valid; // Paper - player's who are dead or not in a world shouldn't move...
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|