1 files changed, 49 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower-stripped/net/minecraft/world/inventory/HopperMenu.java.patch b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/inventory/HopperMenu.java.patch
new file mode 100644
index 0000000000..dd741c4d56
--- /dev/null
+++ b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/inventory/HopperMenu.java.patch
@@ -0,0 +1,49 @@
+--- a/net/minecraft/world/inventory/HopperMenu.java
++++ b/net/minecraft/world/inventory/HopperMenu.java
+@@ -6,18 +6,36 @@
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.item.ItemStack;
+ 
++// CraftBukkit start
++import org.bukkit.craftbukkit.inventory.CraftInventory;
++import org.bukkit.craftbukkit.inventory.CraftInventoryView;
++// CraftBukkit end
++
+ public class HopperMenu extends AbstractContainerMenu {
+ 
+     public static final int CONTAINER_SIZE = 5;
+     private final Container hopper;
+ 
+-    public HopperMenu(int i, Inventory inventory) {
+-        this(i, inventory, new SimpleContainer(5));
++    // CraftBukkit start
++    private CraftInventoryView bukkitEntity = null;
++    private Inventory player;
++
++    @Override
++    public CraftInventoryView getBukkitView() {
++        if (bukkitEntity != null) {
++            return bukkitEntity;
++        }
++
++        CraftInventory inventory = new CraftInventory(this.hopper);
++        bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
++        return bukkitEntity;
+     }
++    // CraftBukkit end
+ 
+     public HopperMenu(int i, Inventory inventory, Container container) {
+         super(MenuType.HOPPER, i);
+         this.hopper = container;
++        this.player = playerInventory; // CraftBukkit - save player
+         checkContainerSize(container, 5);
+         container.startOpen(inventory.player);
+         boolean flag = true;
+@@ -43,6 +64,7 @@
+     @Override
+     @Override
+     public boolean stillValid(Player player) {
++        if (!this.checkReachable) return true; // CraftBukkit
+         return this.hopper.stillValid(player);
+     }
+