From 0d381884eb1a041b4306d669c078a480f3918c81 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 23 Aug 2016 20:56:50 +0200 Subject: [PATCH] Fixed disassembling stacked Storage Blocks only returns 1 set of items, fixes #282 --- CHANGELOG.md | 1 + src/main/java/refinedstorage/item/ItemBlockFluidStorage.java | 2 +- src/main/java/refinedstorage/item/ItemBlockStorage.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bed66999..e05eb11e4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed Wireless Grid not working cross dimensionally - Fixed Grid not displaying items after changing redstone mode - Fixed Wireless Transmitter crashing when it is transmitting to a removed dimension +- Fixed disassembling stacked Storage Blocks only returns 1 set of items - Priority field and detector amount field can now display 4 digits at a time **Features** diff --git a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java index f4d484798..8de6dea40 100755 --- a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java @@ -42,7 +42,7 @@ public class ItemBlockFluidStorage extends ItemBlockBase { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { EnumFluidStorageType type = EnumFluidStorageType.getById(stack.getMetadata()); - if (type != null && isValid(stack) && FluidStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileFluidStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemFluidStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { + if (type != null && isValid(stack) && stack.stackSize == 1 && FluidStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileFluidStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemFluidStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { ItemStack storagePart = new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, stack.getMetadata()); if (!player.inventory.addItemStackToInventory(storagePart.copy())) { diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index bab92210b..73dbec43f 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -42,7 +42,7 @@ public class ItemBlockStorage extends ItemBlockBase { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata()); - if (type != null && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { + if (type != null && stack.stackSize == 1 && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata()); if (!player.inventory.addItemStackToInventory(storagePart.copy())) {