Merge pull request Mithion#1235 from DoomFruit/MagiciansWorkbenchFix

Fixes issue Mithion#1029
DoomFruit · Sep 12, 2015 · 1b0b0bc · 1b0b0bc
2 parents d2a5a9a + dade0ad
commit 1b0b0bc
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/main/java/am2/containers/slots/SlotMagiciansWorkbenchCrafting.java b/src/main/java/am2/containers/slots/SlotMagiciansWorkbenchCrafting.java
@@ -141,17 +141,13 @@ private void doStandardDecrement(IInventory inventory, ItemStack itemstack1, int
 				MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, itemstack2));
 				itemstack2 = null;
 			}
-
-			if (itemstack2 != null && (itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1))){
-				if (inventory.getStackInSlot(i) == null){
-					inventory.setInventorySlotContents(i, itemstack2);
-				}else{
-					if (itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1)){
-						if (!this.thePlayer.inventory.addItemStackToInventory(itemstack2))
-							this.thePlayer.dropItem(itemstack2.getItem(), itemstack2.getItemDamage());
-					}
-				}
+
+			if (itemstack2 != null){
+			        inventory.setInventorySlotContents(i, itemstack2);
+			}else{
+			        inventory.decrStackSize(i, 1);
 			}
+
 		}else{
 			inventory.decrStackSize(i, 1);
 		}