From 22c4861d76209be6c3779f37d9c7d93af06b3b1a Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 5 Feb 2016 04:12:16 -0600
Subject: [PATCH] Update CraftBukkit

---
 CraftBukkit                                   |  2 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  4 +--
 ...icate-entity-UUID-logging-toggleable.patch | 35 -------------------
 3 files changed, 3 insertions(+), 38 deletions(-)
 rename Spigot-Server-Patches/{All-chunks-are-spawn-chunks-toggle.patch => All-chunks-are-slime-spawn-chunks-toggle.patch} (92%)
 delete mode 100644 Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch

diff --git a/CraftBukkit b/CraftBukkit
index 039621dd44..efe04b82b2 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 039621dd44a2e07429d34d01832be5a066ba1d32
+Subproject commit efe04b82b2dc2b1aedc55c10800d423bd8330ce1
diff --git a/Spigot-Server-Patches/All-chunks-are-spawn-chunks-toggle.patch b/Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 92%
rename from Spigot-Server-Patches/All-chunks-are-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch
index ba9f4a6ed5..5f88075fc8 100644
--- a/Spigot-Server-Patches/All-chunks-are-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Fri, 29 Jan 2016 02:28:17 -0600
-Subject: [PATCH] All chunks are spawn chunks toggle
+Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
      {
-         logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
+         useHopperCheck = getBoolean( "use-hopper-check", false );
      }
 +
 +    public boolean allChunksAreSlimeChunks;
diff --git a/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch b/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch
deleted file mode 100644
index 1a83520e78..0000000000
--- a/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
-     {
-         useHopperCheck = getBoolean( "use-hopper-check", false );
-     }
-+
-+    public boolean logDuplicateEntityUUIDs;
-+    private void logDuplicateEntityUUIDs()
-+    {
-+        logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
-+    }
- }
---
\ No newline at end of file