Guard against negative slot indexes. Fix crash with Botania (but stil…

…l doesn't work right)
jaquadro · Oct 18, 2014 · ea47e67 · ea47e67
1 parent 581ecd7
commit ea47e67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/DrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/DrawerData.java
@@ -87,7 +87,7 @@ public ItemStack getReadOnlyItemStack () {
     }
 
     public ItemStack getNewItemStack () {
-        if (protoStack == null)
+        if (protoStack == nullStack)
             return null;
 
         return protoStack.copy();

diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityCompDrawers.java
@@ -459,7 +459,7 @@ public int getSizeInventory () {
 
     @Override
     public ItemStack getStackInSlot (int slot) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return null;
 
         ItemStack stack = getItemsFromSlot(slot, getItemStackSize(slot));
@@ -478,7 +478,7 @@ public ItemStack getStackInSlot (int slot) {
 
     @Override
     public ItemStack decrStackSize (int slot, int count) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return null;
 
         ItemStack stack = takeItemsFromSlot(slot, count);
@@ -495,7 +495,7 @@ public ItemStack getStackInSlotOnClosing (int slot) {
 
     @Override
     public void setInventorySlotContents (int slot, ItemStack itemStack) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return;
 
         int insertCount = itemStack.stackSize;
@@ -551,7 +551,7 @@ public void closeInventory () {
 
     @Override
     public boolean isItemValidForSlot (int slot, ItemStack itemStack) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return false;
 
         if (!isSlotValid(0))
@@ -581,7 +581,7 @@ public int[] getAccessibleSlotsFromSide (int side) {
 
     @Override
     public boolean canInsertItem (int slot, ItemStack stack, int side) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return false;
 
         for (int aside : autoSides) {

diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java
@@ -218,7 +218,7 @@ public int getSizeInventory () {
 
     @Override
     public ItemStack getStackInSlot (int slot) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return null;
 
         ItemStack stack = getItemsFromSlot(slot, getItemStackSize(slot));
@@ -237,7 +237,7 @@ public ItemStack getStackInSlot (int slot) {
 
     @Override
     public ItemStack decrStackSize (int slot, int count) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return null;
 
         ItemStack stack = takeItemsFromSlot(slot, count);
@@ -254,7 +254,7 @@ public ItemStack getStackInSlotOnClosing (int slot) {
 
     @Override
     public void setInventorySlotContents (int slot, ItemStack itemStack) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return;
 
         int insertCount = itemStack.stackSize;
@@ -310,7 +310,7 @@ public void closeInventory () {
 
     @Override
     public boolean isItemValidForSlot (int slot, ItemStack itemStack) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return false;
 
         if (data[slot].getItem() == null)
@@ -341,7 +341,7 @@ public int[] getAccessibleSlotsFromSide (int side) {
 
     @Override
     public boolean canInsertItem (int slot, ItemStack stack, int side) {
-        if (slot >= getSizeInventory())
+        if (slot < 0 || slot >= getSizeInventory())
             return false;
 
         for (int aside : autoSides) {