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/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);
 --