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

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  clear current chunk and entity slice on chunk unload
This commit is contained in:
Aikar
2018-07-30 01:06:39 -04:00
parent ef22f9d531 2b23006694
commit 5fe01c2659
6 changed files with 27 additions and 11 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 7f882bdca..4e32ae7db 100644
index 982ab51f62..14e98fcedf 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 implements IChunkAccess {
@@ -60,8 +60,16 @@ index 7f882bdca..4e32ae7db 100644
this.markDirty();
if (entity instanceof EntityItem) {
itemCounts[i]--;
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
}
// 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 184d46191..3a5b3f34a 100644
index afbd846aad..181a9b7546 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 INamableTileEntity, ICommandListener, Ke