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:
  Fix some false positive warnings printing that shouldnt be
This commit is contained in:
Aikar
2018-08-20 20:23:06 -04:00
parent 7156bc2260 bcb9bb64f0
commit 4312faeee5
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 67e2158ca1..17f19219f2 100644
index abdcf7745a..bd31a7dcab 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 {
@@ -54,7 +54,7 @@ index 67e2158ca1..17f19219f2 100644
// Paper start
- if (!this.entitySlices[i].remove(entity)) {
- return;
+ if (entitySlices[i] == entity.entitySlice) {
+ if (entity.entitySlice == null || !entity.entitySlice.contains(entity) || entitySlices[i] == entity.entitySlice) {
+ entity.entitySlice = null;
+ } else {
+ LogManager.getLogger().warn(entity + " was removed from a entitySlice we did not expect. Report this to https://github.com/PaperMC/Paper/issues/1302");