# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1256936299 0
# Node ID 4bbf5624ced6df9aab033274be4c387a722f9c21
# Parent  11bad32cfa069c4ead6cdcfaeeb06091f7db07f0
 * Only check current amount of equipment when the slot isn't unlimited (needs unit test writing)
no-open-ticket

diff -r 11bad32cfa06 -r 4bbf5624ced6 api/Util/UnitEquipmentUtil.cs
--- a/api/Util/UnitEquipmentUtil.cs	Fri Oct 30 20:31:00 2009 +0000
+++ b/api/Util/UnitEquipmentUtil.cs	Fri Oct 30 20:58:19 2009 +0000
@@ -144,9 +144,9 @@
 		{
 			double limit = 0;
 			AbstractLimit slotLimit = GetSlotLimitForItem(unit, equip);
-			
-			
-			if (!(slotLimit is IPercentageLimit || slotLimit is UnlimitedLimit) || unit.GetEquipmentAmountInSlot (equip.SlotName) != 0)
+
+
+			if (!(slotLimit is IPercentageLimit || slotLimit is UnlimitedLimit) || (!(slotLimit is UnlimitedLimit) && unit.GetEquipmentAmountInSlotWithoutItem(equip) != 0))
 			{
 				limit = (GetMaxEquipmentCount(unit, equip) / (double)unit.Size) * 100.0;
 			}
@@ -177,7 +177,7 @@
 			AbstractLimit slotLimit = GetSlotLimitForItem(unit, equip);
 			
 			
-			if (!(slotLimit is IPercentageLimit || slotLimit is UnlimitedLimit) || unit.GetEquipmentAmountInSlot (equip.SlotName) != 0)
+			if (!(slotLimit is IPercentageLimit || slotLimit is UnlimitedLimit) || (!(slotLimit is UnlimitedLimit) && unit.GetEquipmentAmountInSlotWithoutItem(equip) != 0))
 			{
 				limit = (GetMinEquipmentCount(unit, equip) / (double)unit.Size) * 100.0;
 			}