diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
| commit | a1bc16ae700db9a0445e707bc95ed9f21fcb13f9 (patch) | |
| tree | bd64d8a4e8577606895c8fb4344d2de580a4b5d4 /src/main/java/gregtech/common/GT_Proxy.java | |
| parent | eeab702de4c84effbe22fd0a78b96deae1a31def (diff) | |
| parent | 7a872dfad2b018869e2790573196a3dfc12cafe9 (diff) | |
| download | GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.gz GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.bz2 GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.zip | |
Merge branch 'new-features' into experimental
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 9ed45dd89f..95f71a1278 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1539,7 +1539,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } public Object getRightItem(EntityPlayer player, int ID){ - ItemStack mStack = player.getEquipmentInSlot(ID / 100); + ItemStack mStack = player.getEquipmentInSlot(ID/100); if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null; switch(ID % 100){ @@ -1748,12 +1748,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) { rFuelValue = (short) Math.max(rFuelValue, 600); } - if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1, new Object[0]))) { - rFuelValue = Math.max(rFuelValue, 100000); - } if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1, new Object[0]))) { - rFuelValue = Math.max(rFuelValue, 150000); + rFuelValue = (short) Math.max(rFuelValue, 150000); } + if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1, new Object[0]))) { + rFuelValue = (short) Math.max(rFuelValue, 100000); + } + return rFuelValue; } |