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

Protect network == null

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-21 20:59:41 +02:00
parent 330a422eb1
commit e3280ddb31
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -140,11 +140,12 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
@Override @Override
public void writeContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
buf.writeInt(getNetwork().getEnergy().getEnergyStored()); buf.writeInt(getNetwork() != null ? getNetwork().getEnergy().getEnergyStored() : 0);
buf.writeInt(getNetwork().getEnergyUsage()); buf.writeInt(getNetwork() != null ? getNetwork().getEnergyUsage() : 0);
buf.writeInt(getNetwork().getRedstoneMode().id); buf.writeInt(getNetwork() != null ? getNetwork().getRedstoneMode().id : RedstoneMode.IGNORE.id);
if (getNetwork() != null) {
List<ClientSlave> clientSlaves = new ArrayList<ClientSlave>(); List<ClientSlave> clientSlaves = new ArrayList<ClientSlave>();
Iterator<INetworkSlave> slaves = getNetwork().getSlaves(); Iterator<INetworkSlave> slaves = getNetwork().getSlaves();
@@ -180,6 +181,9 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
buf.writeInt(slave.amount); buf.writeInt(slave.amount);
ByteBufUtils.writeItemStack(buf, slave.stack); ByteBufUtils.writeItemStack(buf, slave.stack);
} }
} else {
buf.writeInt(0);
}
} }
@Override @Override