aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-29 19:59:06 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-29 19:59:06 +1000
commite274d8c74cd009bbaaa9ea1b821ffac4ba0fc54d (patch)
treeb8a8667df6df99dabff868ca26db4e62ce90d6d5 /src/Java/gtPlusPlus/core/block
parent8fb534cda0f292f90eb3b9325ddfbbc0e145f561 (diff)
downloadGT5-Unofficial-e274d8c74cd009bbaaa9ea1b821ffac4ba0fc54d.tar.gz
GT5-Unofficial-e274d8c74cd009bbaaa9ea1b821ffac4ba0fc54d.tar.bz2
GT5-Unofficial-e274d8c74cd009bbaaa9ea1b821ffac4ba0fc54d.zip
% Fixed a class name. IndustrialPlatePress.
+ Added many more config options. $ Fixed workbench crash, third time lucky.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 22536aa19b..ed986b756e 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -68,9 +68,12 @@ public class Machine_Workbench extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
{
- if (world.isRemote) return true;
- ItemStack heldItem = PlayerUtils.getItemStackInPlayersHand();
+ ItemStack heldItem = null;
+ if (world.isRemote){
+ heldItem = PlayerUtils.getItemStackInPlayersHand();
+ }
+
boolean holdingWrench = false;
if (heldItem != null){
@@ -94,6 +97,7 @@ public class Machine_Workbench extends BlockContainer
}
}
+ if (world.isRemote) return true;
TileEntity te = world.getTileEntity(x, y, z);
if (te != null && te instanceof TileEntityWorkbench)