From 9d4f92e66835295106eb203250ea3987c7d4a062 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 18 Jun 2015 21:08:05 -0300 Subject: [PATCH] fix NPE with the builder robot --- .../core/builders/BuildingSlotMapIterator.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/core/builders/BuildingSlotMapIterator.java b/common/buildcraft/core/builders/BuildingSlotMapIterator.java index aaf2ec57..5181092b 100755 --- a/common/buildcraft/core/builders/BuildingSlotMapIterator.java +++ b/common/buildcraft/core/builders/BuildingSlotMapIterator.java @@ -34,12 +34,15 @@ public class BuildingSlotMapIterator { this.slots = slots; this.impIterator = slots.keySet().iterator(); this.buildStageOccurences = buildStageOccurences; - this.isCreative = builder.getWorldObj().getWorldInfo().getGameType() == WorldSettings.GameType.CREATIVE; + this.isCreative = builder == null + || builder.getWorldObj().getWorldInfo().getGameType() == WorldSettings.GameType.CREATIVE; // Generate available pairs - availablePairs.add(new BuilderItemMetaPair(null)); - for (int i = 0; i < builder.getSizeInventory(); i++) { - availablePairs.add(new BuilderItemMetaPair(builder.getStackInSlot(i))); + if (builder != null) { + availablePairs.add(new BuilderItemMetaPair(null)); + for (int i = 0; i < builder.getSizeInventory(); i++) { + availablePairs.add(new BuilderItemMetaPair(builder.getStackInSlot(i))); + } } findNewCurrent();