diff --git a/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch b/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch index 91a196b426..d1526e47c9 100644 --- a/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch +++ b/Spigot-Server-Patches/Check-entity-count-additions-and-mark-entities-remov.patch @@ -14,12 +14,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - Try to catch plugins doing indecent things + boolean ignoreAdd = false; -+ if (entity.aa) { -+ boolean thisChunk = entity.getChunkX() == this.locX && entity.getChunkY() == k && entity.getChunkZ() == this.locZ; ++ if (entity.aa && entity.getChunkX() == this.locX && entity.getChunkY() == k && entity.getChunkZ() == this.locZ) { + String chunkName = entity.getWorld().getWorld().getName() + ":" + entity.getChunkX() + "," + entity.getChunkY() + "," + entity.getChunkZ(); -+ if (!thisChunk) { -+ throw new IllegalStateException("Entity Already in another chunk: " + chunkName); -+ } else if (this.entitySlices[k].contains(entity)) { ++ if (this.entitySlices[k].contains(entity)) { + new Throwable("Double Chunk Add to: " + chunkName).printStackTrace(); + ignoreAdd = true; + } else {