From ca2468fda61049e3d7ec1e1b1a52c74b2ad7bb9d Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Tue, 27 Dec 2016 10:33:13 +0100
Subject: [PATCH] Add additional checks to the farmers inventory adding method
 Hopefully closes #521

---
 .../actuallyadditions/mod/util/WorldUtil.java   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
index 97eadadd8..0189cd4c2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
@@ -235,20 +235,25 @@ public final class WorldUtil{
 
         int working = 0;
         for(ItemStack stack : stacks){
-            for(int i = start; i < end; i++){
-                stack = inventory.insertItemInternal(i, stack, false);
+            if(StackUtil.isValid(stack)){
+                for(int i = start; i < end; i++){
+                    stack = inventory.insertItemInternal(i, stack, false);
 
-                if(!StackUtil.isValid(stack)){
-                    working++;
-                    break;
+                    if(!StackUtil.isValid(stack)){
+                        working++;
+                        break;
+                    }
                 }
             }
+            else{
+                working++;
+            }
         }
 
         //Load the slots again
         if(!actuallyDo){
             for(int i = 0; i < backupSlots.length; i++){
-                inventory.setStackInSlot(i, backupSlots[i]);
+                inventory.setStackInSlot(i, StackUtil.validateCheck(backupSlots[i]));
             }
         }