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

Nullchecks

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-22 00:09:55 +02:00
parent 7687c2e385
commit 27455b118a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
@Override @Override
public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
return getNetwork().getEnergy().receiveEnergy(maxReceive, simulate); return getNetwork() != null ? getNetwork().getEnergy().receiveEnergy(maxReceive, simulate) : 0;
} }
@Override @Override
@@ -69,7 +69,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
} }
public int getEnergyScaled(int i) { public int getEnergyScaled(int i) {
float stored = worldObj.isRemote ? energy : getNetwork().getEnergy().getEnergyStored(); float stored = worldObj.isRemote ? energy : (getNetwork() != null ? getNetwork().getEnergy().getEnergyStored() : 0);
float max = NetworkMaster.ENERGY_CAPACITY; float max = NetworkMaster.ENERGY_CAPACITY;
return (int) (stored / max * (float) i); return (int) (stored / max * (float) i);
@@ -77,7 +77,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
@Override @Override
public int getMaxEnergyStored(EnumFacing from) { public int getMaxEnergyStored(EnumFacing from) {
return getNetwork().getEnergy().getMaxEnergyStored(); return getNetwork() != null ? getNetwork().getEnergy().getMaxEnergyStored() : 0;
} }
@Override @Override
@@ -87,13 +87,15 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
@Override @Override
public RedstoneMode getRedstoneMode() { public RedstoneMode getRedstoneMode() {
return worldObj.isRemote ? redstoneMode : getNetwork().getRedstoneMode(); return worldObj.isRemote ? redstoneMode : (getNetwork() != null ? getNetwork().getRedstoneMode() : RedstoneMode.IGNORE);
} }
@Override @Override
public void setRedstoneMode(RedstoneMode mode) { public void setRedstoneMode(RedstoneMode mode) {
if (getNetwork() != null) {
getNetwork().setRedstoneMode(mode); getNetwork().setRedstoneMode(mode);
} }
}
public List<ClientSlave> getClientSlaves() { public List<ClientSlave> getClientSlaves() {
return clientSlaves; return clientSlaves;