From b978b76443c3060aa6c9cc8da060af4ff7494c2e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 26 Jun 2016 22:51:20 -0500
Subject: [PATCH] Update upstream CB

It seems they've gotten their own workaround figured out, we'll keep our own fix for TE removal in but let them try theirs and see if it's better now.
---
 ...fix-TileEntities-as-they-are-removed.patch | 19 -------------------
 work/CraftBukkit                              |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Spigot-Server-Patches/Don-t-try-and-fix-TileEntities-as-they-are-removed.patch b/Spigot-Server-Patches/Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
index 94a358d48c..c625fdd195 100644
--- a/Spigot-Server-Patches/Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
+++ b/Spigot-Server-Patches/Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
@@ -114,23 +114,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Block type = getType(pos).getBlock();
  
          if (type == Blocks.CHEST || type == Blocks.TRAPPED_CHEST) { // Spigot
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-         IBlockData blockData = getNMSBlock(type).fromLegacyData(data);
-         BlockPosition position = new BlockPosition(x, y, z);
- 
-+        // Paper start - Unnecessary, root issue is CB TE's fixer getting too involved. Also potential data issues.
-+        /*
-         // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
-         if (type != 0) {
-             chunk.getHandle().getWorld().setTypeAndData(position, Blocks.AIR.getBlockData(), 0);
-         }
-+        */
-+        // Paper end
- 
-         if (applyPhysics) {
-             return chunk.getHandle().getWorld().setTypeAndData(position, blockData, 3);
 --
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0ebb9c7afa..00359a18fa 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0ebb9c7afa7b79222b7f6ec5fffcaa0aa41de7b9
+Subproject commit 00359a18fae1e239652687f1991b07bfb71fc80b