1 files changed, 35 insertions, 1 deletions

diff --git a/src/UI/BeaconWindow.h b/src/UI/BeaconWindow.h
index 0ea5a7e6a..a2ec50f02 100644
--- a/src/UI/BeaconWindow.h
+++ b/src/UI/BeaconWindow.h
@@ -26,14 +26,48 @@ public:
 		cWindow(wtBeacon, "Beacon"),
 		m_Beacon(a_Beacon)
 	{
-		m_ShouldDistributeToHotbarFirst = true;
 		m_SlotAreas.push_back(new cSlotAreaBeacon(m_Beacon, *this));
 		m_SlotAreas.push_back(new cSlotAreaInventory(*this));
 		m_SlotAreas.push_back(new cSlotAreaHotBar(*this));
 	}
 
+
 	cBeaconEntity * GetBeaconEntity(void) const { return m_Beacon; }
 
+	
+	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])
+		{
+			// Beacon Area
+			AreasInOrder.push_back(m_SlotAreas[2]);  /* Hotbar    */
+			AreasInOrder.push_back(m_SlotAreas[1]);  /* Inventory */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, true);
+		}
+		else
+		{
+			if (cSlotAreaBeacon::IsPlaceableItem(a_ItemStack.m_ItemType) && (a_ItemStack.m_ItemCount == 1))
+			{
+				AreasInOrder.push_back(m_SlotAreas[0]);  /* Beacon */
+			}
+
+			if (a_ClickedArea == m_SlotAreas[1])
+			{
+				// Inventory Area
+				AreasInOrder.push_back(m_SlotAreas[2]);  /* Hotbar */
+			}
+			else
+			{
+				// Hotbar Area
+				AreasInOrder.push_back(m_SlotAreas[1]);  /* Inventory */
+			}
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+	}
+
+
 	// cWindow Overrides:
 	virtual void OpenedByPlayer(cPlayer & a_Player) override
 	{