Fix/crashes expceptions (#970) (#971)

* merge guard improvements

* add that but have to remove imports

* Fix merge problems.

* merge builder changes

* Fix merge conflicts

* fix some things in placement handler, have to wait for 1.11 capabilities

* fix recipe handler

* merge saturation

* Hotfix/fix happiness (#905)

* save happiness and don't devidi through 0

* add constants

* check if citizenData != null first

* fix assets

* another hotfix, new citizen cause crash if happiness 1

* don't double request resources

* Fix prboblem with incorrect amount of entities requesting

* Fix crash with full inventory on food pickup

* fi xnullpointer

* delay warehouse more

* remove unnecessary import

* fix merge issues

* optimize imports

* merge hotfix

* fix crashes and exceptions

* correct predicate chaining and fix flintNSteel

* Fix bug where things don't get dumped correctly

* Update InventoryUtils.java

* make marvin happy

* fix citizenData null crash

* fix name

* improve creative tab

* Fix up nullpointer exception

* merge builder and lj positioning

* merge sonar fix

* fix merge bugs

* change creativetab

* fix bug with dman dumping wrong

src/main/java/com/minecolonies/coremod/tileentities/TileEntityWareHouse.java

@@ -490,8 +490,7 @@ public void dumpInventoryIntoWareHouse(@NotNull final InventoryCitizen inventory
         for (int i = 0; i < new InvWrapper(inventoryCitizen).getSlots(); i++)
         {
             final ItemStack stack = inventoryCitizen.getStackInSlot(i);
-
-            if(stack == null || stack.getItem() == null || stack.getCount() == 0)
+            if(InventoryUtils.isItemStackEmpty(stack))
             {
                 continue;
             }
@@ -501,8 +500,7 @@ public void dumpInventoryIntoWareHouse(@NotNull final InventoryCitizen inventory
                 LanguageHandler.sendPlayersMessage(getColony().getMessageEntityPlayers(), "com.minecolonies.coremod.wareHouse.full");
                 return;
             }
-            InventoryUtils.addItemStackToProvider(chest, stack);
-            new InvWrapper(inventoryCitizen).extractItem(i, Integer.MAX_VALUE, false);
+            InventoryUtils.transferItemStackIntoNextFreeSlotInProvider(new InvWrapper(inventoryCitizen), i, chest);
         }
 
     }