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

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

@@ -140,45 +140,49 @@ 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);
List<ClientSlave> clientSlaves = new ArrayList<ClientSlave>(); if (getNetwork() != null) {
List<ClientSlave> clientSlaves = new ArrayList<ClientSlave>();
Iterator<INetworkSlave> slaves = getNetwork().getSlaves(); Iterator<INetworkSlave> slaves = getNetwork().getSlaves();
while (slaves.hasNext()) { while (slaves.hasNext()) {
INetworkSlave slave = slaves.next(); INetworkSlave slave = slaves.next();
if (slave.canUpdate()) { if (slave.canUpdate()) {
IBlockState state = worldObj.getBlockState(slave.getPosition()); IBlockState state = worldObj.getBlockState(slave.getPosition());
ClientSlave clientSlave = new ClientSlave(); ClientSlave clientSlave = new ClientSlave();
clientSlave.energyUsage = slave.getEnergyUsage(); clientSlave.energyUsage = slave.getEnergyUsage();
clientSlave.amount = 1; clientSlave.amount = 1;
clientSlave.stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); clientSlave.stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));
if (clientSlaves.contains(clientSlave)) { if (clientSlaves.contains(clientSlave)) {
for (ClientSlave other : clientSlaves) { for (ClientSlave other : clientSlaves) {
if (other.equals(clientSlave)) { if (other.equals(clientSlave)) {
other.amount++; other.amount++;
break; break;
}
} }
} else {
clientSlaves.add(clientSlave);
} }
} else {
clientSlaves.add(clientSlave);
} }
} }
}
buf.writeInt(clientSlaves.size()); buf.writeInt(clientSlaves.size());
for (ClientSlave slave : clientSlaves) { for (ClientSlave slave : clientSlaves) {
buf.writeInt(slave.energyUsage); buf.writeInt(slave.energyUsage);
buf.writeInt(slave.amount); buf.writeInt(slave.amount);
ByteBufUtils.writeItemStack(buf, slave.stack); ByteBufUtils.writeItemStack(buf, slave.stack);
}
} else {
buf.writeInt(0);
} }
} }