1 files changed, 8 insertions, 4 deletions

diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 0fd006485..88d961106 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -38,11 +38,15 @@ public:
 		Vector3d EntityPos = a_Entity->GetPosition();
 		double Distance = (EntityPos - m_Position).Length();
 
-		if ((Distance < 1.2) && ((cPickup *)a_Entity)->GetItem().IsEqual(m_Pickup->GetItem()))
+		cItem & Item = ((cPickup *)a_Entity)->GetItem();
+		if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()))
 		{
-			m_Pickup->GetItem().AddCount(((cPickup *)a_Entity)->GetItem().m_ItemCount);
-			a_Entity->Destroy();
-			m_FoundMatchingPickup = true;
+			if ((Item.m_ItemCount + m_Pickup->GetItem().m_ItemCount) <= Item.GetMaxStackSize())
+			{
+				m_Pickup->GetItem().AddCount(Item.m_ItemCount);
+				a_Entity->Destroy();
+				m_FoundMatchingPickup = true;
+			}
 		}
 		return false;
 	}