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

Merge pull request #145 from CovertJaguar/patch-1

Browse source 
Fixed NPE in Tank Triggers
This commit is contained in:
Krapht 2012-07-30 12:14:18 -07:00
commit eb735ec1f6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/core/TriggerLiquidContainer.java
View file

@ -86,7 +86,7 @@ public class TriggerLiquidContainer extends Trigger {
if (liquids != null && liquids.length > 0) {
for (ILiquidTank c : liquids)
if (c.getLiquid().amount != 0)
if (c.getLiquid() != null && c.getLiquid().amount != 0)
return false;
return true;
@ -94,7 +94,7 @@ public class TriggerLiquidContainer extends Trigger {
return false;
case Contains:
for (ILiquidTank c : liquids)
if (c.getLiquid().amount != 0)
if (c.getLiquid() != null && c.getLiquid().amount != 0)
if (seachedLiquidId == 0 || seachedLiquidId == c.getLiquid().itemID)
return true;
@ -102,7 +102,7 @@ public class TriggerLiquidContainer extends Trigger {
case Space:
for (ILiquidTank c : liquids)
if (c.getLiquid().amount == 0)
if (c.getLiquid() == null || c.getLiquid().amount == 0)
return true;
else if (c.getLiquid().amount < c.getCapacity())
if (seachedLiquidId == 0 || seachedLiquidId == c.getLiquid().itemID)
@ -111,7 +111,7 @@ public class TriggerLiquidContainer extends Trigger {
return false;
case Full:
for (ILiquidTank c : liquids)
if (c.getLiquid().amount < c.getCapacity())
if (c.getLiquid() == null || c.getLiquid().amount < c.getCapacity())
return false;
return true;