From b2ca559851dec2318d90e41925afb655650e0eba Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Mon, 23 Feb 2015 02:03:52 -0800
Subject: [PATCH] Make Container.mergeItemStack respect Slot.isValidItem Closes
 #1630

---
 .../net/minecraft/inventory/Container.java.patch      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 patches/minecraft/net/minecraft/inventory/Container.java.patch

diff --git a/patches/minecraft/net/minecraft/inventory/Container.java.patch b/patches/minecraft/net/minecraft/inventory/Container.java.patch
new file mode 100644
index 0000000000..0b289ff595
--- /dev/null
+++ b/patches/minecraft/net/minecraft/inventory/Container.java.patch
@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/inventory/Container.java
++++ ../src-work/minecraft/net/minecraft/inventory/Container.java
+@@ -624,7 +624,7 @@
+                 slot = (Slot)this.field_75151_b.get(k);
+                 itemstack1 = slot.func_75211_c();
+ 
+-                if (itemstack1 == null)
++                if (itemstack1 == null && slot.func_75214_a(p_75135_1_)) // Forge: Make sure to respect isItemValid in the slot.
+                 {
+                     slot.func_75215_d(p_75135_1_.func_77946_l());
+                     slot.func_75218_e();