diff options
author | Blood-Asp <Blood@Asp> | 2015-09-05 00:43:17 +0200 |
---|---|---|
committer | Blood-Asp <Blood@Asp> | 2015-09-05 00:43:17 +0200 |
commit | 0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d (patch) | |
tree | bfb00465ac39c40ffcfce8203454b695ebe39466 /main/java/gregtech/api/util/GT_ModHandler.java | |
parent | 4263f3b43f1009df01574ce84c4dcc8e8aeed82c (diff) | |
download | GT5-Unofficial-0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d.tar.gz GT5-Unofficial-0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d.tar.bz2 GT5-Unofficial-0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d.zip |
Version 5.08.28
Diffstat (limited to 'main/java/gregtech/api/util/GT_ModHandler.java')
-rw-r--r-- | main/java/gregtech/api/util/GT_ModHandler.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java index 93aba7cfb7..22759cd057 100644 --- a/main/java/gregtech/api/util/GT_ModHandler.java +++ b/main/java/gregtech/api/util/GT_ModHandler.java @@ -1500,7 +1500,7 @@ public class GT_ModHandler { if (aPlayer instanceof EntityPlayer) { EntityPlayer tPlayer = (EntityPlayer)aPlayer; if (tPlayer.capabilities.isCreativeMode) return T; - System.out.println("hier"); + if(isElectricItem(aStack)&&ic2.api.item.ElectricItem.manager.getCharge(aStack)>1000.0d){ for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) { if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) { tPlayer.inventory.mainInventory[i].stackSize--; @@ -1508,7 +1508,10 @@ public class GT_ModHandler { if (canUseElectricItem(aStack, 10000)) { return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer)aPlayer); } + GT_ModHandler.useElectricItem(aStack, (int) ic2.api.item.ElectricItem.manager.getCharge(aStack), (EntityPlayer)aPlayer); + return false; } + } } } else { damageOrDechargeItem(aStack, 1, 1000, aPlayer); |