Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1118 from SandGrainOne/master

Browse source 
isActive method can give NullPointerException
This commit is contained in:
CovertJaguar 2013-08-14 02:23:50 -07:00
commit 7522478dd3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/buildcraft/factory/TilePump.java
View file

@ -315,9 +315,14 @@ public class TilePump extends TileBuildCraft implements IMachine, IPowerReceptor
@Override @Override
public boolean isActive() { public boolean isActive() {
BlockIndex next = getNextIndexToPump(false); BlockIndex next = getNextIndexToPump(false);
if (next != null) {
return isPumpableFluid(next.x, next.y, next.z); return isPumpableFluid(next.x, next.y, next.z);
} }
return false;
}
@Override @Override
public PowerReceiver getPowerReceiver(ForgeDirection side) { public PowerReceiver getPowerReceiver(ForgeDirection side) {
return powerHandler.getPowerReceiver(); return powerHandler.getPowerReceiver();