From 88d2d15bb45e67af8ad9d65160f5f14575b45b6f Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 9 Apr 2016 21:33:29 -0500 Subject: [PATCH] Apply the Ensure inv drag is in bounds patch properly Closes GH-174 --- .../Ensure-inv-drag-is-in-bounds.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch index 43e198d6c6..8d66ea7018 100644 --- a/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch @@ -9,12 +9,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -0,0 +0,0 @@ public abstract class Container { - } + this.d(); + } + } else if (this.g == 1) { +- Slot slot = (Slot) this.c.get(i); ++ Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds - public ItemStack b(EntityHuman entityhuman, int i) { -- Slot slot = (Slot) this.c.get(i); -+ Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds - - return slot != null ? slot.getItem() : null; - } + if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) { + this.h.add(slot); -- \ No newline at end of file