Logic cleanup

src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java

@@ -58,10 +58,8 @@ public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHa
         if (!item.validForEquip(origin, player, itemManager))
             return true;
 
-        if (item.containerType == Enum.ItemContainerType.EQUIPPED) {
+        if (item.containerType == Enum.ItemContainerType.EQUIPPED)
-            itemManager.equipped.remove(item.equipSlot);
             itemManager.moveItemToInventory(item);
-        }
 
         int ItemType = item.getObjectType().ordinal();
         int ItemID = item.getObjectUUID();

src/engine/objects/CharacterItemManager.java

@@ -1005,9 +1005,8 @@ public class CharacterItemManager {
                     this.absCharacter.cancelOnUnEquip();
             }
 
-            // Clear equipment of item.
+            // remove it from other lists:
-
+            this.remItemFromLists(item);
-            this.absCharacter.charItemManager.equipped.remove(item.equipSlot);
 
             // check to see what type of AbstractCharacter subclass we have stored
 
@@ -1017,9 +1016,6 @@ public class CharacterItemManager {
             } else if (!item.moveItemToInventory((NPC) this.absCharacter))
                 return false;
 
-            // remove it from other lists:
-            this.remItemFromLists(item);
-
             // add to Inventory
             this.inventory.add(item);
             item.addToCache();
@@ -1695,10 +1691,11 @@ public class CharacterItemManager {
         return lootItem;
     }
 
-    private synchronized void remItemFromLists(Item i) {
+    private synchronized void remItemFromLists(Item item) {
-        this.vault.remove(i);
+        this.equipped.remove(item.equipSlot);
-        this.bank.remove(i);
+        this.vault.remove(item);
-        this.inventory.remove(i);
+        this.bank.remove(item);
+        this.inventory.remove(item);
     }
 
     /*