dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update TileMachine.java

Browse Source 
null pointer on worldObj
This commit is contained in:
tomevoll
2016-03-28 07:06:36 +02:00
parent b3ef81b9c2
commit fc53745157
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/refinedstorage/tile/TileMachine.java
View File

@@ -19,7 +19,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
private Block originalBlock; private Block originalBlock;
public void onConnected(TileController controller) { public void onConnected(TileController controller) {
if (worldObj.getBlockState(pos).getBlock() == originalBlock) { if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) {
markDirty(); markDirty();
connected = true; connected = true;
@@ -31,7 +31,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
} }
public void onDisconnected() { public void onDisconnected() {
if (worldObj.getBlockState(pos).getBlock() == originalBlock) { if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) {
markDirty(); markDirty();
connected = false; connected = false;
@@ -42,6 +42,12 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
@Override @Override
public void update() { public void update() {
if(worldObj == null)
{
super.update();
return;
}
if (ticks == 0) { if (ticks == 0) {
originalBlock = worldObj.getBlockState(pos).getBlock(); originalBlock = worldObj.getBlockState(pos).getBlock();
} }