From c73dca71df8be88b4283f7f7f32372201763a31c Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 9 Jun 2019 08:49:28 +1000
Subject: [PATCH] Rebuild patches

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/EntityItem.patch      | 4 ++--
 paper-server/nms-patches/PlayerInventory.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/paper-server/nms-patches/EntityItem.patch b/paper-server/nms-patches/EntityItem.patch
index 5c30c97fa6..c0d7e7e8bb 100644
--- a/paper-server/nms-patches/EntityItem.patch
+++ b/paper-server/nms-patches/EntityItem.patch
@@ -97,7 +97,7 @@
              this.velocityChanged();
              this.f = (int) ((float) this.f - f);
              if (this.f <= 0) {
-@@ -267,6 +289,35 @@
+@@ -267,6 +289,38 @@
              Item item = itemstack.getItem();
              int i = itemstack.getCount();
  
@@ -136,7 +136,7 @@
              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()) {
-@@ -309,7 +360,9 @@
+@@ -309,7 +363,9 @@
      }
  
      public void setItemStack(ItemStack itemstack) {
diff --git a/paper-server/nms-patches/PlayerInventory.patch b/paper-server/nms-patches/PlayerInventory.patch
index b5c6b2b7ec..43da74f470 100644
--- a/paper-server/nms-patches/PlayerInventory.patch
+++ b/paper-server/nms-patches/PlayerInventory.patch
@@ -69,7 +69,7 @@
      public PlayerInventory(EntityHuman entityhuman) {
          this.items = NonNullList.a(36, ItemStack.a);
          this.armor = NonNullList.a(4, ItemStack.a);
-@@ -41,6 +96,22 @@
+@@ -41,6 +96,28 @@
          return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
      }
  
@@ -98,7 +98,7 @@
      public int getFirstEmptySlotIndex() {
          for (int i = 0; i < this.items.size(); ++i) {
              if (((ItemStack) this.items.get(i)).isEmpty()) {
-@@ -513,8 +584,9 @@
+@@ -513,8 +590,9 @@
                  ItemStack itemstack = (ItemStack) this.armor.get(i);
  
                  if (itemstack.getItem() instanceof ItemArmor) {
@@ -109,7 +109,7 @@
                      });
                  }
              }
-@@ -550,6 +622,11 @@
+@@ -550,6 +628,11 @@
      }
  
      public ItemStack getCarried() {