From 9d46b56e26f3e91392572f6dccec7bfdbd5728c6 Mon Sep 17 00:00:00 2001
From: DerFrZocker <derrieple@gmail.com>
Date: Fri, 3 Jun 2022 09:19:53 +1000
Subject: [PATCH] SPIGOT-7009: Stuck on "Loading terrain..." after
 disconnecting on respawn screen

---
 .../net/minecraft/world/entity/EntityLiving.patch        | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nms-patches/net/minecraft/world/entity/EntityLiving.patch b/nms-patches/net/minecraft/world/entity/EntityLiving.patch
index 9b0f1505b..64a78db4d 100644
--- a/nms-patches/net/minecraft/world/entity/EntityLiving.patch
+++ b/nms-patches/net/minecraft/world/entity/EntityLiving.patch
@@ -78,15 +78,6 @@
              }
          }
  
-@@ -563,7 +609,7 @@
- 
-     protected void tickDeath() {
-         ++this.deathTime;
--        if (this.deathTime == 20 && !this.level.isClientSide()) {
-+        if (this.deathTime >= 20 && !this.isRemoved() && !this.level.isClientSide()) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
-             this.level.broadcastEntityEvent(this, (byte) 60);
-             this.remove(Entity.RemovalReason.KILLED);
-         }
 @@ -655,9 +701,15 @@
      }