From 744ef7a25b35b3adf3d1c50f14b18960a5d1317e Mon Sep 17 00:00:00 2001 From: Krapht Date: Fri, 29 Jun 2012 16:10:07 +0200 Subject: [PATCH] Fix NPE on world load when tileBuffer is not yet fully initialized --- .../src/buildcraft/transport/pipes/PipeLiquidsSandstone.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java index cb300527..569ae7f2 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -28,8 +28,11 @@ public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsH @Override public int fill(Orientations from, int quantity, int id, boolean doFill) { + if (container.tileBuffer == null || container.tileBuffer[from.ordinal()] == null) + return 0; + if (!(container.tileBuffer[from.ordinal()].getTile() instanceof TileGenericPipe)) - return 0; + return 0; return ((PipeTransportLiquids)this.transport).side[from.ordinal()].fill(quantity, doFill, (short) id); }