mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-31 03:38:13 +02:00
Fix unregistering entities from unloading chunks
CraftBukkit caused a regression here by making unloading chunks not have a ticket added and returning unloaded future. This caused entities who were killed in same tick their chunk is unloading to not be able to be removed from the chunk. This then results in dead entities lingering in the Chunk. Combine that with a buggy detail of the previous implementation of the Dupe UUID patch, then this was the likely source of the "Ghost entities"
This commit is contained in:
parent
4bbe3334fb
commit
7a1b44c9de
1 changed files with 33 additions and 0 deletions
|
@ -0,0 +1,33 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 31 Mar 2020 03:01:45 -0400
|
||||
Subject: [PATCH] Fix unregistering entities from unloading chunks
|
||||
|
||||
CraftBukkit caused a regression here by making unloading chunks not
|
||||
have a ticket added and returning unloaded future.
|
||||
|
||||
This caused entities who were killed in same tick their chunk is unloading
|
||||
to not be able to be removed from the chunk.
|
||||
|
||||
This then results in dead entities lingering in the Chunk.
|
||||
|
||||
Combine that with a buggy detail of the previous implementation of
|
||||
the Dupe UUID patch, then this was the likely source of the "Ghost entities"
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 9cb22eef56..f7a9b58db3 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -0,0 +0,0 @@ public class WorldServer extends World {
|
||||
}
|
||||
|
||||
private void removeEntityFromChunk(Entity entity) {
|
||||
- IChunkAccess ichunkaccess = this.getChunkAt(entity.chunkX, entity.chunkZ, ChunkStatus.FULL, false);
|
||||
+ Chunk ichunkaccess = entity.getCurrentChunk(); // Paper - getChunkAt(x,z,full,false) is broken by CraftBukkit as it won't return an unloading chunk. Use our current chunk reference as this points to what chunk they need to be removed from anyways
|
||||
|
||||
- if (ichunkaccess instanceof Chunk) {
|
||||
+ if (ichunkaccess != null) { // Paper
|
||||
((Chunk) ichunkaccess).b(entity);
|
||||
}
|
||||
|
||||
--
|
Loading…
Add table
Reference in a new issue