From f0e32d948f9ddfac7e474611b90aaf607f869ef1 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 2 Dec 2016 18:07:07 -0600
Subject: [PATCH] Update upstream CB

---
 ...imize-World.isLoaded-BlockPosition-Z.patch | 21 -------------------
 ...ata-Conversion-post-ItemMeta-on-Copy.patch | 17 ++-------------
 work/CraftBukkit                              |  2 +-
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete 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
deleted file mode 100644
index d96ea2f098..0000000000
--- a/Spigot-Server-Patches/Optimize-World.isLoaded-BlockPosition-Z.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 238df3cf00..f6741ec6c0 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,21 +14,8 @@ 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 66973051a..1218c005e 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 {
@@ -58,7 +45,7 @@ index 66973051a..1218c005e 100644
              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 4afd3a99a..a862e946c 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 1d54397474..9beb0c9968 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1d54397474b270227e82aabf15ef5444ecfe839c
+Subproject commit 9beb0c9968c228788c7bbc446316ccd20e6a0c15