ItemTable slot variable refactor, plus other minor code changes.

2016-06-25 12:24:23 +00:00
parent b4ba1fc0a5
commit 2d382fad91
10 changed files with 60 additions and 63 deletions
--- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@ -1727,14 +1727,11 @@ public abstract class Inventory extends ItemContainer
 		// find same (or incompatible) brooch jewel type
 		for (int i = PAPERDOLL_BROOCH_JEWEL1; i < (PAPERDOLL_BROOCH_JEWEL1 + getBroochJewelSlots()); i++)
 		{
-			if (_paperdoll[i] != null)
+			if ((_paperdoll[i] != null) && (getPaperdollItemId(i) == item.getId()))
 			{
-				if (getPaperdollItemId(i) == item.getId())
-				{
-					// overwtite
-					setPaperdollItem(i, item);
-					return;
-				}
+				// overwtite
+				setPaperdollItem(i, item);
+				return;
 			}
 		}