Do not allow negative count itemstacks (infinite itemstacks)

Should work around quite a few issues and this 'feature' is relatively worthless anyway
2014-12-19 16:35:01 -06:00
parent c683d9ad52
commit 73bc2489c0
2 changed files with 239 additions and 0 deletions
--- a/Spigot-Server-Patches/mc-dev-imports.patch
+++ b/Spigot-Server-Patches/mc-dev-imports.patch
@@ -300,4 +300,89 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/Slot.java b/src/main/java/net/minecraft/server/Slot.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/Slot.java
+@@ -0,0 +0,0 @@
+package net.minecraft.server;
+
+public class Slot {
+
+    public final int index;
+    public final IInventory inventory;
+    public int rawSlotIndex;
+    public int f;
+    public int g;
+
+    public Slot(IInventory iinventory, int i, int j, int k) {
+        this.inventory = iinventory;
+        this.index = i;
+        this.f = j;
+        this.g = k;
+    }
+
+    public void a(ItemStack itemstack, ItemStack itemstack1) {
+        if (itemstack != null && itemstack1 != null) {
+            if (itemstack.getItem() == itemstack1.getItem()) {
+                int i = itemstack1.count - itemstack.count;
+
+                if (i > 0) {
+                    this.a(itemstack, i);
+                }
+
+            }
+        }
+    }
+
+    protected void a(ItemStack itemstack, int i) {}
+
+    protected void c(ItemStack itemstack) {}
+
+    public void a(EntityHuman entityhuman, ItemStack itemstack) {
+        this.f();
+    }
+
+    public boolean isAllowed(ItemStack itemstack) {
+        return true;
+    }
+
+    public ItemStack getItem() {
+        return this.inventory.getItem(this.index);
+    }
+
+    public boolean hasItem() {
+        return this.getItem() != null;
+    }
+
+    public void set(ItemStack itemstack) {
+        this.inventory.setItem(this.index, itemstack);
+        this.f();
+    }
+
+    public void f() {
+        this.inventory.update();
+    }
+
+    public int getMaxStackSize() {
+        return this.inventory.getMaxStackSize();
+    }
+
+    public int getMaxStackSize(ItemStack itemstack) {
+        return this.getMaxStackSize();
+    }
+
+    public ItemStack a(int i) {
+        return this.inventory.splitStack(this.index, i);
+    }
+
+    public boolean a(IInventory iinventory, int i) {
+        return iinventory == this.inventory && i == this.index;
+    }
+
+    public boolean isAllowed(EntityHuman entityhuman) {
+        return true;
+    }
+}
 --