From 7af07de57bd3b53a81c40443f59fb6727e25f954 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 2 Mar 2019 18:52:16 -0500
Subject: [PATCH] Remove left over debug from entity slices

---
 .../Add-some-Debug-to-Chunk-Entity-slices.patch             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
index 56557424d..03595e236 100644
--- a/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -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 42b76b2122..1c9e2cb1ce 100644
+index 42b76b2122..7dd59ee031 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 {
@@ -22,7 +22,7 @@ index 42b76b2122..1c9e2cb1ce 100644
 +        List<Entity> entitySlice = this.entitySlices[k];
 +        boolean inThis = entitySlice.contains(entity);
 +        List<Entity> currentSlice = entity.entitySlice;
-+        if ((currentSlice != null && currentSlice.contains(entity)) || inThis) {
++        if (inThis || (currentSlice != null && currentSlice.contains(entity))) {
 +            if (currentSlice == entitySlice || inThis) {
 +                return;
 +            } else {
@@ -32,7 +32,7 @@ index 42b76b2122..1c9e2cb1ce 100644
 +                } else {
 +                    removeEntity(entity);
 +                }
-+                new Throwable().printStackTrace();
++                currentSlice.remove(entity); // Just incase the above did not remove from this target slice
 +            }
 +        }
 +        entity.entitySlice = entitySlice;