From 8fdd76bae1382368ac1e0bd1076db227a5f9c670 Mon Sep 17 00:00:00 2001
From: boni <bonii-xx@users.noreply.github.com>
Date: Mon, 2 May 2016 21:19:54 +0200
Subject: [PATCH] Fix SidedInvWrapper accessing wrong slots for setStackInSlot.
 (#2797)

Fix DoubleChestItemHandler not implementing IItemHandlerModifiable
---
 .../items/VanillaDoubleChestItemHandler.java   | 18 +++++++++++++++++-
 .../items/wrapper/SidedInvWrapper.java         |  5 ++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java b/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java
index 90232a6757..05839f6f3a 100644
--- a/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java
+++ b/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java
@@ -12,7 +12,7 @@ import java.lang.ref.WeakReference;
 
 import com.google.common.base.Objects;
 
-public class VanillaDoubleChestItemHandler extends WeakReference<TileEntityChest> implements IItemHandler
+public class VanillaDoubleChestItemHandler extends WeakReference<TileEntityChest> implements IItemHandlerModifiable
 {
     // Dummy cache value to signify that we have checked and definitely found no adjacent chests
     public static final VanillaDoubleChestItemHandler NO_ADJACENT_CHESTS_INSTANCE = new VanillaDoubleChestItemHandler(null, null, false);
@@ -91,6 +91,22 @@ public class VanillaDoubleChestItemHandler extends WeakReference<TileEntityChest
         return chest != null ? chest.getStackInSlot(targetSlot) : null;
     }
 
+    @Override
+    public void setStackInSlot(int slot, ItemStack stack)
+    {
+        boolean accessingUpperChest = slot < 27;
+        int targetSlot = accessingUpperChest ? slot : slot - 27;
+        TileEntityChest chest = getChest(accessingUpperChest);
+        if (chest != null)
+        {
+            IItemHandler singleHandler = chest.getSingleChestHandler();
+            if (singleHandler instanceof IItemHandlerModifiable)
+            {
+                ((IItemHandlerModifiable) singleHandler).setStackInSlot(targetSlot, stack);
+            }
+        }
+    }
+
     @Override
     public ItemStack insertItem(int slot, ItemStack stack, boolean simulate)
     {
diff --git a/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java
index 8d0d61a44c..8139a94827 100644
--- a/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java
+++ b/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java
@@ -144,7 +144,10 @@ public class SidedInvWrapper implements IItemHandlerModifiable
     @Override
     public void setStackInSlot(int slot, ItemStack stack)
     {
-        inv.setInventorySlotContents(slot, stack);
+        int slot1 = getSlot(inv, slot, side);
+
+        if (slot1 != -1)
+            inv.setInventorySlotContents(slot1, stack);
     }
 
     @Override