From e4183e7069107a8e2bdb9b1d3f30a663e27614d3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 19 Nov 2018 20:59:37 +1100
Subject: [PATCH] SPIGOT-4491: Fix InventoryMoveItemEvent causing repeated
 events

---
 nms-patches/TileEntityHopper.patch | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/nms-patches/TileEntityHopper.patch b/nms-patches/TileEntityHopper.patch
index 0dc8df6e27..41cba66fb3 100644
--- a/nms-patches/TileEntityHopper.patch
+++ b/nms-patches/TileEntityHopper.patch
@@ -56,7 +56,7 @@
      }
  
      public void Y_() {
-@@ -165,10 +199,35 @@
+@@ -165,7 +199,28 @@
                  for (int i = 0; i < this.getSize(); ++i) {
                      if (!this.getItem(i).isEmpty()) {
                          ItemStack itemstack = this.getItem(i).cloneItemStack();
@@ -82,19 +82,11 @@
 +                            return false;
 +                        }
 +                        ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
++                        // CraftBukkit end
  
                          if (itemstack1.isEmpty()) {
--                            iinventory.update();
-+                            if (event.getItem().equals(oitemstack)) {
-+                                iinventory.update();
-+                            } else {
-+                                this.setItem(i, itemstack);
-+                            }
-+                            // CraftBukkit end
-                             return true;
-                         }
- 
-@@ -290,10 +349,41 @@
+                             iinventory.update();
+@@ -290,7 +345,34 @@
  
          if (!itemstack.isEmpty() && b(iinventory, itemstack, i, enumdirection)) {
              ItemStack itemstack1 = itemstack.cloneItemStack();
@@ -126,19 +118,11 @@
 +                return false;
 +            }
 +            ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
++            // CraftBukkit end
  
              if (itemstack2.isEmpty()) {
--                iinventory.update();
-+                if (event.getItem().equals(oitemstack)) {
-+                    iinventory.update();
-+                } else {
-+                    iinventory.setItem(i, itemstack1);
-+                }
-+                // CraftBukkit end
-                 return true;
-             }
- 
-@@ -305,6 +395,13 @@
+                 iinventory.update();
+@@ -305,6 +387,13 @@
  
      public static boolean a(IInventory iinventory, EntityItem entityitem) {
          boolean flag = false;