From e66fdc98485e5aaf93ea9d9e5d223e35d137c48d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 28 Dec 2015 20:06:25 -0600
Subject: [PATCH] Make duplicate entity UUID logging toggleable


diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6186f6c..3ec58dc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -995,7 +995,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
         // CraftBukkit start
         UUID uuid = entity.getUniqueID();
 
-        if (this.entitiesByUUID.containsKey(uuid)) {
+        if (this.paperSpigotConfig.logDuplicateEntityUUIDs && this.entitiesByUUID.containsKey(uuid)) { // PaperSpigot - Make toggleable
             Entity entity1 = (Entity) this.entitiesByUUID.get(uuid);
 
             if (this.g.contains(entity1)) {
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index 7eb3463..add9680 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -382,4 +382,10 @@ public class PaperSpigotWorldConfig
     {
         useHopperCheck = getBoolean( "use-hopper-check", false );
     }
+
+    public boolean logDuplicateEntityUUIDs;
+    private void logDuplicateEntityUUIDs()
+    {
+        logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
+    }
 }
-- 
2.7.0