tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed NPE

Browse source
This commit is contained in:
Henry Mao 2013-01-08 17:01:32 +08:00
parent a4a54a784a
commit 88f5e31eef
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
View file

@ -69,29 +69,32 @@ public abstract class TileEntityAssemblyNetwork extends TileEntityElectricityRec
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
{
for (Object obj : ElectricityConnections.getDirections(this).toArray())
if (ElectricityConnections.getDirections(this) != null)
{
if (obj != null)
for (Object obj : ElectricityConnections.getDirections(this))
{
ForgeDirection inputDirection = (ForgeDirection) obj;
TileEntity inputTile = Vector3.getTileEntityFromSide(this.worldObj, new Vector3(this), inputDirection);
ElectricityNetwork network = ElectricityNetwork.getNetworkFromTileEntity(inputTile, inputDirection);
if (network != null)
if (obj != null)
{
if (this.wattsReceived >= this.getRequest().getWatts())
ForgeDirection inputDirection = (ForgeDirection) obj;
TileEntity inputTile = Vector3.getTileEntityFromSide(this.worldObj, new Vector3(this), inputDirection);
ElectricityNetwork network = ElectricityNetwork.getNetworkFromTileEntity(inputTile, inputDirection);
if (network != null)
{
network.stopRequesting(this);
}
else
{
network.startRequesting(this, this.getRequest());
this.wattsReceived += network.consumeElectricity(this).getWatts() * 2;
if (this.wattsReceived >= this.getRequest().getWatts())
{
network.stopRequesting(this);
}
else
{
network.startRequesting(this, this.getRequest());
this.wattsReceived += network.consumeElectricity(this).getWatts() * 2;
}
}
}
}
}
}
}