From 724054c19b693b99794e8d212f6f119b351ed8ae Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sat, 9 May 2015 15:52:39 -0400 Subject: [PATCH] Fix major item dupe bug with Steve's Workshop; Fix item insertion bug with Steve's Workshop; Inserting items from pipes/sided inventory will trigger conversion until drawer has less than 1 stack of capacity. --- build.gradle | 2 +- .../minecraft/storagedrawers/inventory/InventoryStack.java | 3 +++ .../storagedrawers/inventory/StorageInventory.java | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 854f0b5..3e6be7c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.4.3" +version = "1.7.10-1.4.5" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java index 1ccfbef..86a8401 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryStack.java @@ -33,6 +33,9 @@ public abstract class InventoryStack } public ItemStack getInStack () { + if (inStack == null || inStack.stackSize == 0) + return null; + return inStack; } diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java index 472b44f..8e08ad5 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/inventory/StorageInventory.java @@ -228,10 +228,8 @@ public class StorageInventory implements IDrawerInventory drawer.setStoredItemCount(insertCount); - if (upgrade.isVoid()) - item.stackSize = 0; - else - item.stackSize -= insertCount; + if (!upgrade.isVoid()) + item.stackSize = insertCount; } }