Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
0309d17d Rebuild patches

work/pre-source-patches/Fix-EntityItem-hunks.patch

@@ -1,20 +0,0 @@
---- work/CraftBukkit/nms-patches/EntityItem.patch	2019-06-08 15:17:36.374050325 -0500
-+++ work/CraftBukkit/nms-patches/EntityItem.patch	2019-06-08 15:17:36.374050325 -0500
-@@ -0,0 +0,0 @@
-              this.velocityChanged();
-              this.f = (int) ((float) this.f - f);
-              if (this.f <= 0) {
--@@ -0,0 +0,0 @@
-+@@ -0,0 +0,0 @@
-              Item item = itemstack.getItem();
-              int i = itemstack.getCount();
-  
-@@ -0,0 +0,0 @@
-              if (this.pickupDelay == 0 && (this.owner == null || 6000 - this.age <= 200 || this.owner.equals(entityhuman.getUniqueID())) && entityhuman.inventory.pickup(itemstack)) {
-                  entityhuman.receive(this, i);
-                  if (itemstack.isEmpty()) {
--@@ -0,0 +0,0 @@
-+@@ -0,0 +0,0 @@
-      }
-  
-      public void setItemStack(ItemStack itemstack) {

work/pre-source-patches/Fix-PlayerInventory-file.patch

@@ -1,29 +0,0 @@
---- work/CraftBukkit/nms-patches/PlayerInventory.patch	2019-06-08 15:17:36.377383665 -0500
-+++ work/CraftBukkit/nms-patches/PlayerInventory.patch	2019-06-08 15:17:36.377383665 -0500
-@@ -0,0 +0,0 @@
-      public PlayerInventory(EntityHuman entityhuman) {
-          this.items = NonNullList.a(36, ItemStack.a);
-          this.armor = NonNullList.a(4, ItemStack.a);
--@@ -0,0 +0,0 @@
-+@@ -0,0 +0,0 @@
-          return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
-      }
-  
-@@ -0,0 +0,0 @@
-      public int getFirstEmptySlotIndex() {
-          for (int i = 0; i < this.items.size(); ++i) {
-              if (((ItemStack) this.items.get(i)).isEmpty()) {
--@@ -0,0 +0,0 @@
-+@@ -0,0 +0,0 @@
-                  ItemStack itemstack = (ItemStack) this.armor.get(i);
-  
-                  if (itemstack.getItem() instanceof ItemArmor) {
-@@ -0,0 +0,0 @@
-                      });
-                  }
-              }
--@@ -0,0 +0,0 @@
-+@@ -0,0 +0,0 @@
-      }
-  
-      public ItemStack getCarried() {