Fixed "Extracting Certain Items Breaking Most World Interactions". Fixes

#2055
refinedmods · Oct 27, 2018 · ec09642 · ec09642
1 parent 8cb38fe
commit ec09642
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.6.9
 - Fixed OpenComputers "unknown error" when using extract item API (raoulvdberge)
 - Fixed client FPS stuttering when opening a Crafting Grid (raoulvdberge)
+- Fixed rare Grid crashing issue (raoulvdberge)
 
 ### 1.6.8
 - Fixed Ender IO incompatibility (raoulvdberge)

diff --git a/...in/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/...in/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
@@ -90,18 +90,22 @@ public void onExtract(EntityPlayerMP player, int hash, int flags) {
                 if (ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) {
                     took = network.extractItem(item, size, Action.PERFORM);
 
-                    ItemHandlerHelper.insertItem(playerInventory, took, false);
+                    if (took != null) {
+                        ItemHandlerHelper.insertItem(playerInventory, took, false);
+                    }
                 }
             } else {
                 took = network.extractItem(item, size, Action.PERFORM);
 
-                if (single && !held.isEmpty()) {
-                    held.grow(1);
-                } else {
-                    player.inventory.setItemStack(took);
-                }
+                if (took != null) {
+                    if (single && !held.isEmpty()) {
+                        held.grow(1);
+                    } else {
+                        player.inventory.setItemStack(took);
+                    }
 
-                player.updateHeldItem();
+                    player.updateHeldItem();
+                }
             }
 
             INetworkItem networkItem = network.getNetworkItemHandler().getItem(player);