SPIGOT-7009: Stuck on "Loading terrain..." after disconnecting on respawn screen

This commit is contained in:
DerFrZocker 2022-06-03 09:19:53 +10:00 committed by md_5
parent 95d233dc5b
commit 9d46b56e26
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11

View File

@ -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 @@
}