diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-08-14 05:56:41 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-08-14 05:56:41 +0100 |
| commit | 19062e1d36700f9f0a7ed95daa80bc4c4578241f (patch) | |
| tree | 5c0f53d7c08b61015a76ebd246886f3e076bdd82 /src/main/java/gregtech/api/items/GT_MetaBase_Item.java | |
| parent | bfccecf87bce3487bc72699782488ac64bc5623f (diff) | |
| download | GT5-Unofficial-19062e1d36700f9f0a7ed95daa80bc4c4578241f.tar.gz GT5-Unofficial-19062e1d36700f9f0a7ed95daa80bc4c4578241f.tar.bz2 GT5-Unofficial-19062e1d36700f9f0a7ed95daa80bc4c4578241f.zip | |
Bugfixes 6
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 | 4 |
1 files changed, 2 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 4e58019839..ab11dbb690 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -207,7 +207,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci if (tStats[3] == -2 && tCharge <= 0) { aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY); } else { - aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharfge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + EnumChatFormatting.GRAY); + aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + EnumChatFormatting.GRAY); } } } @@ -294,7 +294,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 (/*tTransfer == aAmount*/Math.abs(tTransfer - aAmount) < .0000001) { discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); chargeFromArmor(aStack, aPlayer); return true; |