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

Merge pull request #88 from psxlover/NPEfixes

Browse source 
NPE fixes
This commit is contained in:
SirSengir 2012-07-11 14:57:18 -07:00
parent e24e663fbd c3dc022880
commit 740cb92802
7 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/net/minecraft/src/buildcraft/api/liquids/LiquidManager.java
View file

@ -18,6 +18,15 @@ public class LiquidManager {
return null;
}
public static int getLiquidIDForFilledItem(ItemStack filledItem) {
LiquidStack liquidForFilledItem = getLiquidForFilledItem(filledItem);
if (liquidForFilledItem == null)
return 0;
return liquidForFilledItem.itemID;
}
public static ItemStack getFilledItemForLiquid(LiquidStack liquid) {
for (LiquidData data : liquids)

2
common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java
View file

@ -74,7 +74,7 @@ public class TriggerLiquidContainer extends Trigger {
int seachedLiquidId = 0;
if (parameter != null && parameter.getItem() != null)
seachedLiquidId = LiquidManager.getLiquidForFilledItem(parameter.getItem()).itemID;
seachedLiquidId = LiquidManager.getLiquidIDForFilledItem(parameter.getItem());
LiquidSlot[] liquids = container.getLiquidSlots();

2
common/net/minecraft/src/buildcraft/energy/EngineIron.java
View file

@ -124,7 +124,7 @@ public class EngineIron extends Engine {
super.update();
if (itemInInventory != null) {
int liquidId = LiquidManager.getLiquidForFilledItem(itemInInventory).itemID;
int liquidId = LiquidManager.getLiquidIDForFilledItem(itemInInventory);
if (liquidId != 0) {
if (fill(Orientations.Unknown, BuildCraftAPI.BUCKET_VOLUME, liquidId, false) == BuildCraftAPI.BUCKET_VOLUME) {

2
common/net/minecraft/src/buildcraft/factory/BlockRefinery.java
View file

@ -102,7 +102,7 @@ public class BlockRefinery extends BlockContainer {
return true;
} else {
int liquidId = LiquidManager.getLiquidForFilledItem(entityplayer.getCurrentEquippedItem()).itemID;
int liquidId = LiquidManager.getLiquidIDForFilledItem(entityplayer.getCurrentEquippedItem());
if (liquidId != 0) {
int qty = ((TileRefinery) world.getBlockTileEntity(i, j, k)).fill(Orientations.Unknown,

2
common/net/minecraft/src/buildcraft/factory/BlockTank.java
View file

@ -92,7 +92,7 @@ public class BlockTank extends BlockContainer implements ITextureProvider {
ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null) {
int liquidId = LiquidManager.getLiquidForFilledItem(current).itemID;
int liquidId = LiquidManager.getLiquidIDForFilledItem(current);
TileTank tank = (TileTank) world.getBlockTileEntity(i, j, k);

3
common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java
View file

@ -141,6 +141,9 @@ public class PipeTransportPower extends PipeTransport {
if (entity instanceof TileGenericPipe) {
TileGenericPipe nearbyTile = (TileGenericPipe) entity;
if (nearbyTile.pipe == null)
continue;
PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyTile.pipe.transport;
nearbyTransport.requestEnergy(Orientations.values()[i].reverse(), transferQuery[i]);

2
common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
View file

@ -93,7 +93,7 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe {
int seachedLiquidId = 0;
if (parameter != null && parameter.getItem() != null)
seachedLiquidId = LiquidManager.getLiquidForFilledItem(parameter.getItem()).itemID;
seachedLiquidId = LiquidManager.getLiquidIDForFilledItem(parameter.getItem());
if (kind == Kind.Empty) {
for (LiquidBuffer b : transportLiquids.side)