Fix crash extracting items in certain scenarios

jaquadro · Jul 10, 2017 · 7fd506b · 7fd506b
1 parent 2f3342f
commit 7fd506b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 
 minecraft_base_version=1.12
 minecraft_version=1.12
-mod_version=5.2.6
+mod_version=5.2.7
 chameleon_version=4.1.0
 chameleon_max_version=5.0.0
 

diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
@@ -746,28 +746,30 @@ public ItemStack extractItem (@Nonnull ItemStack stack, int amount, boolean simu
             Set<Integer> checkedSlots = (simulate) ? new HashSet<>() : null;
 
             int remaining = amount;
-            for (SlotRecord record : primaryRecords) {
-                IDrawerGroup candidateGroup = getGroupForSlotRecord(record);
-                if (candidateGroup == null)
-                    continue;
+            if (primaryRecords != null) {
+                for (SlotRecord record : primaryRecords) {
+                    IDrawerGroup candidateGroup = getGroupForSlotRecord(record);
+                    if (candidateGroup == null)
+                        continue;
 
-                IDrawer drawer = candidateGroup.getDrawer(record.slot);
-                if (!drawer.isEnabled())
-                    continue;
-                if (!testPredicateExtract(drawer, stack, predicate))
-                    continue;
-                if (!hasAccess(candidateGroup, drawer))
-                    continue;
+                    IDrawer drawer = candidateGroup.getDrawer(record.slot);
+                    if (!drawer.isEnabled())
+                        continue;
+                    if (!testPredicateExtract(drawer, stack, predicate))
+                        continue;
+                    if (!hasAccess(candidateGroup, drawer))
+                        continue;
 
-                remaining = (simulate)
-                    ? Math.max(remaining - drawer.getStoredItemCount(), 0)
-                    : drawer.adjustStoredItemCount(-remaining);
+                    remaining = (simulate)
+                        ? Math.max(remaining - drawer.getStoredItemCount(), 0)
+                        : drawer.adjustStoredItemCount(-remaining);
 
-                if (remaining == 0)
-                    return stackResult(stack, amount);
+                    if (remaining == 0)
+                        return stackResult(stack, amount);
 
-                if (simulate)
-                    checkedSlots.add(record.index);
+                    if (simulate)
+                        checkedSlots.add(record.index);
+                }
             }
 
             for (int slot : drawerSlots) {