diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-20 17:03:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 17:03:18 +0100 |
| commit | 8f2e13681b91a6e531ee9c199cbf78be077e6381 (patch) | |
| tree | e59861327c07b8a4f63632d0c57afc4b4f274d6c /src/main/java/gregtech/api/items/GT_MetaBase_Item.java | |
| parent | a03fc7fc1dcc57168e567fbdd09afdd895ce2570 (diff) | |
| parent | 312141cd1096a19d07aa0a5186cd3e7eeee51a9d (diff) | |
| download | GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.gz GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.bz2 GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.zip | |
Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
Diffstat (limited to 'src/main/java/gregtech/api/items/GT_MetaBase_Item.java')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaBase_Item.java | 3 |
1 files changed, 1 insertions, 2 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 1e0e59a080..7796691540 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -39,7 +39,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci * Creates the Item using these Parameters. * * @param aUnlocalized The Unlocalized Name of this Item. - * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ public GT_MetaBase_Item(String aUnlocalized) { super(aUnlocalized, "Generated Item", null, false); @@ -290,7 +289,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci chargeFromArmor(aStack, aPlayer); if (aPlayer instanceof EntityPlayer && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) return true; double tTransfer = discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true); - if (tTransfer == aAmount) { + if (Math.abs(tTransfer - aAmount) < .0000001) { discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); chargeFromArmor(aStack, aPlayer); return true; |