aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2020-05-31 20:32:55 +0200
committerGitHub <noreply@github.com>2020-05-31 20:32:55 +0200
commitec0e3815c96f7e346eb441716a178feed1a00dca (patch)
tree839dc5063e485cb8ffea8b0d07ed4442c4b8813c /src
parent33c3d83e5f7fa331dd47d1258c9ec65ac19af215 (diff)
parent5a34664d0790c2c6155c77f4abc409ef6e12e766 (diff)
downloadGT5-Unofficial-ec0e3815c96f7e346eb441716a178feed1a00dca.tar.gz
GT5-Unofficial-ec0e3815c96f7e346eb441716a178feed1a00dca.tar.bz2
GT5-Unofficial-ec0e3815c96f7e346eb441716a178feed1a00dca.zip
Merge pull request #299 from GTNewHorizons/only_mutate_on_doDrain_true
Only modify aStack when doDrain == true [Cell Bug Fix]
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaBase_Item.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index 264c510701..edc60b45fc 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -514,11 +514,13 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
if (tFluid != null && maxDrain >= tFluid.amount) {
ItemStack tStack = GT_Utility.getContainerItem(aStack, false);
if (tStack == null) {
- aStack.stackSize = 0;
+ if(doDrain) aStack.stackSize = 0;
return tFluid;
}
- aStack.setItemDamage(tStack.getItemDamage());
- aStack.func_150996_a(tStack.getItem());
+ if(doDrain) {
+ aStack.setItemDamage(tStack.getItemDamage());
+ aStack.func_150996_a(tStack.getItem());
+ }
return tFluid;
}