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.

Spigot-Server-Patches/0165-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch

@@ -1,4 +1,4 @@
-From 199cb45701fdd79ac7b6e3898ab6f3eff5f4c959 Mon Sep 17 00:00:00 2001
+From 0c57cddcc662b2ad9f8eeb4fa39b4294a736d05e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 25 Jun 2016 23:55:56 -0500
 Subject: [PATCH] Don't try and fix TileEntities as they are removed
@@ -114,25 +114,6 @@ index 3377f97..269ae39 100644
          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 ed7e76f..988101a 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -136,10 +136,14 @@ 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);
 -- 
-2.9.0.windows.1
+2.9.0
 

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 0ebb9c7afa7b79222b7f6ec5fffcaa0aa41de7b9
+Subproject commit 00359a18fae1e239652687f1991b07bfb71fc80b