SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clear current chunk and entity slice on chunk unload

Browse Source 
ideally this should of never mattered, as it will only
be hit if you teleport out of an unloaded chunk...

But apparently some people are triggering this.

See #1223
This commit is contained in:
Aikar
2018-07-30 00:51:58 -04:00
parent 4bd8975ab6
commit 2b23006694
9 changed files with 71 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
View File

@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
if the entity was to end up in 2 different chunk slices
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index eaee492010..1787607622 100644
index 27b73acdee..be3ac2d940 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk {
@@ -60,8 +60,16 @@ index eaee492010..1787607622 100644
this.markDirty();
entity.setCurrentChunk(null);
entityCounts.decrement(entity.getMinecraftKeyString());
@@ -0,0 +0,0 @@ public class Chunk {
}
// Spigot End
entity.setCurrentChunk(null); // Paper
+ entity.entitySlice = null; // Paper
// Do not pass along players, as doing so can get them stuck outside of time.
// (which for example disables inventory icon updates and prevents block breaking)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fdabb1e369..89f9bd347b 100644
index eb8904a728..1e64d5fcd6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper