From fd25653f1733c00e9d49a57ce159704cebcc6d34 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2019 14:06:25 +1100
Subject: [PATCH] SPIGOT-5448: Shulker Boxes collapse empty slots when picked
 up

---
 nms-patches/Explosion.patch |  8 ++++++++
 nms-patches/LootTable.patch | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 nms-patches/LootTable.patch

diff --git a/nms-patches/Explosion.patch b/nms-patches/Explosion.patch
index 4cfeaa11a5..494c5ea2ce 100644
--- a/nms-patches/Explosion.patch
+++ b/nms-patches/Explosion.patch
@@ -143,3 +143,11 @@
                  }
              }
          }
+@@ -255,6 +326,7 @@
+     }
+ 
+     private static void a(ObjectArrayList<Pair<ItemStack, BlockPosition>> objectarraylist, ItemStack itemstack, BlockPosition blockposition) {
++        if (itemstack.isEmpty()) return; // CraftBukkit - SPIGOT-5425
+         int i = objectarraylist.size();
+ 
+         for (int j = 0; j < i; ++j) {
diff --git a/nms-patches/LootTable.patch b/nms-patches/LootTable.patch
deleted file mode 100644
index 829b5482c4..0000000000
--- a/nms-patches/LootTable.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/net/minecraft/server/LootTable.java
-+++ b/net/minecraft/server/LootTable.java
-@@ -39,6 +39,7 @@
-     public static Consumer<ItemStack> a(Consumer<ItemStack> consumer) {
-         return (itemstack) -> {
-             if (itemstack.getCount() < itemstack.getMaxStackSize()) {
-+                if (itemstack.isEmpty()) return; // CraftBukkit
-                 consumer.accept(itemstack);
-             } else {
-                 int i = itemstack.getCount();