1 files changed, 35 insertions, 0 deletions

diff --git a/src/UI/CraftingWindow.h b/src/UI/CraftingWindow.h
index 9107d8d08..f5a0328f2 100644
--- a/src/UI/CraftingWindow.h
+++ b/src/UI/CraftingWindow.h
@@ -28,6 +28,41 @@ public:
 		m_SlotAreas.push_back(new cSlotAreaInventory(*this));
 		m_SlotAreas.push_back(new cSlotAreaHotBar(*this));
 	}
+
+
+	virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override
+	{
+		cSlotAreas AreasInOrder;
+
+		if (a_ClickedArea == m_SlotAreas[0])
+		{
+			// Crafting Area
+			if (a_Slot == 0)
+			{
+				// Result Slot
+				AreasInOrder.push_back(m_SlotAreas[2]);  /* Hotbar    */
+				AreasInOrder.push_back(m_SlotAreas[1]);  /* Inventory */
+			}
+			else
+			{
+				AreasInOrder.push_back(m_SlotAreas[1]);  /* Inventory */
+				AreasInOrder.push_back(m_SlotAreas[2]);  /* Hotbar */
+			}
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, (a_Slot == 0));
+		}
+		else if (a_ClickedArea == m_SlotAreas[1])
+		{
+			// Inventory Area
+			AreasInOrder.push_back(m_SlotAreas[2]);  /* Hotbar */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+		else
+		{
+			// Hotbar
+			AreasInOrder.push_back(m_SlotAreas[1]);  /* Inventory */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+	}
 };