From 9e40eaf85d0130f205f190b35f581c5cfacf3ea4 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 2 Dec 2016 21:04:24 -0600
Subject: [PATCH] Don't remove random diffs in update

---
 ...imize-World.isLoaded-BlockPosition-Z.patch | 21 +++++++++++++++++++
 ...ata-Conversion-post-ItemMeta-on-Copy.patch | 17 +++++++++++++--
 work/CraftBukkit                              |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 Spigot-Server-Patches/Optimize-World.isLoaded-BlockPosition-Z.patch

diff --git a/Spigot-Server-Patches/Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/Optimize-World.isLoaded-BlockPosition-Z.patch
new file mode 100644
index 0000000000..d96ea2f098
--- /dev/null
+++ b/Spigot-Server-Patches/Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Fri, 2 Dec 2016 00:11:43 -0500
+Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
+
+Reduce method invocations for World.isLoaded(BlockPosition)Z
+
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index e7ae4c706..51e05f414 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+     }
+ 
+     public boolean isLoaded(BlockPosition blockposition) {
+-        return this.a(blockposition, true);
++        return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
+     }
+ 
+     public boolean a(BlockPosition blockposition, boolean flag) {
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch b/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
index f6741ec6c0..238df3cf00 100644
--- a/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
+++ b/Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
@@ -14,8 +14,21 @@ erasing the NBT Tag.
 
 On copy, run conversion post ItemMeta apply.
 
+diff --git a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
+index 4a8820e68..27fb802bf 100644
+--- a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
++++ b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
+@@ -0,0 +0,0 @@ public class DataInspectorBlockEntity implements DataInspector {
+                 boolean flag;
+ 
+                 if (s1 == null) {
+-                    DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s});
++                    //DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s}); // Paper - no need to nag about an ok condition
+                     flag = false;
+                 } else {
+                     flag = !nbttagcompound2.hasKey("id");
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 66973051a..1218c005e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -0,0 +0,0 @@ public final class ItemStack {
@@ -45,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.save(savedStack);
              MinecraftServer.getServer().getDataConverterManager().a(DataConverterTypes.ITEM_INSTANCE, savedStack); // PAIL: convert
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 4afd3a99a..a862e946c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 9beb0c9968..b64d852496 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9beb0c9968c228788c7bbc446316ccd20e6a0c15
+Subproject commit b64d8524968ef0984bb78dd026192e83b56149d8