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

Fix crash

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-05 02:13:53 +02:00
parent f4190271fe
commit 1ed310bcf5
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package refinedstorage.tile;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import refinedstorage.block.BlockMachine;
@@ -12,8 +13,10 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
protected TileController controller;
private Block machineBlock;
public void onConnected(TileController controller) {
if (worldObj != null && worldObj.getBlockState(pos).getBlock() == getBlockType()) {
if (worldObj != null && worldObj.getBlockState(pos).getBlock() == machineBlock) {
markDirty();
this.connected = true;
@@ -24,7 +27,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
}
public void onDisconnected() {
if (worldObj != null && worldObj.getBlockState(pos).getBlock() == getBlockType()) {
if (worldObj != null && worldObj.getBlockState(pos).getBlock() == machineBlock) {
markDirty();
this.connected = false;
@@ -40,9 +43,18 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
@Override
public void update() {
if (worldObj == null) {
super.update();
return;
}
if (ticks == 0) {
machineBlock = worldObj.getBlockState(pos).getBlock();
}
super.update();
if (worldObj != null && !worldObj.isRemote && isConnected()) {
if (!worldObj.isRemote && isConnected()) {
updateMachine();
}
}