Fix some false positive warnings printing that shouldnt be

reduces some log spam

3 files changed, 12 insertions, 11 deletions

diff --git a/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch
index acc5a4413c..ea5d9a5efa 100644
--- a/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0338-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From b40bcfb513f86c14a0fa7cd15281fa6fff4f7aed Mon Sep 17 00:00:00 2001
+From 74c33cb76523595192fe9ad81eec4f582dcdcd68 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -85,7 +85,7 @@ index 14c8edeffc..c3bd82692d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4757081090..3d5b6eabaf 100644
+index 4757081090..d29aec7149 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -115,7 +115,7 @@ index 4757081090..3d5b6eabaf 100644
          }
  
          int k = MathHelper.floor(entity.locY / 16.0D);
-@@ -851,6 +858,50 @@ public class Chunk {
+@@ -851,6 +858,51 @@ public class Chunk {
  
          for (int j = 0; j < i; ++j) {
              List entityslice = aentityslice[j]; // Spigot
@@ -138,6 +138,7 @@ index 4757081090..3d5b6eabaf 100644
 +                    ) {
 +                        logger.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + " because it was near the duplicate and likely an actual duplicate. See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
 +                        entity.die();
++                        iterator.remove();
 +                        continue;
 +                    }
 +                    if (other != null && !other.dead) {
@@ -179,7 +180,7 @@ index 7b856cad91..eb8904a728 100644
          this.uniqueID = uuid;
          this.ar = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5de8da65c0..c53e77b821 100644
+index d96126bcf2..5257db1e00 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -70,7 +70,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0340-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0340-Add-some-Debug-to-Chunk-Entity-slices.patch
index 0fa501df11..271f4fb86b 100644
--- a/Spigot-Server-Patches/0340-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0340-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 31831a472623f2197edb100298c024df40aa8458 Mon Sep 17 00:00:00 2001
+From cb60a9794593e7752a415d3f558e8b789054c2eb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -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 195cde784b..82abe2a914 100644
+index ce66bb780d..2a5d1c90b4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -681,8 +681,34 @@ public class Chunk {
@@ -52,7 +52,7 @@ index 195cde784b..82abe2a914 100644
          }
  
          // Paper start
-+        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");
@@ -61,7 +61,7 @@ index 195cde784b..82abe2a914 100644
          if (!this.entitySlices[i].remove(entity)) { return; }
          this.markDirty();
          entity.setCurrentChunk(null);
-@@ -954,6 +986,7 @@ public class Chunk {
+@@ -955,6 +987,7 @@ public class Chunk {
                  }
                  // Spigot End
                  entity.setCurrentChunk(null); // Paper
diff --git a/Spigot-Server-Patches/0348-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0348-Entity-add-to-world-fixes.patch
index 036e2fbd87..0557588e80 100644
--- a/Spigot-Server-Patches/0348-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0348-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 5bb574d9652dadb2b33f6a6a6c538a244f06af73 Mon Sep 17 00:00:00 2001
+From 7c862f1ffd126fdece882da529400f7b090dd19a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 82abe2a914..f618e8f628 100644
+index 2a5d1c90b4..1d2673a7b3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -889,6 +889,7 @@ public class Chunk {
@@ -25,7 +25,7 @@ index 82abe2a914..f618e8f628 100644
  
          for (int j = 0; j < i; ++j) {
              List entityslice = aentityslice[j]; // Spigot
-@@ -935,10 +936,12 @@ public class Chunk {
+@@ -936,10 +937,12 @@ public class Chunk {
                      thisChunk.put(entity.uniqueID, entity);
                  }
              }