Fix set formation bugs

Author: insthync

modules/HELPERS.js

@@ -641,15 +641,20 @@ function HelperSetFormation(playerId, characterId, formationName, position)
     if (characterId && characterId.length > 0)
     {
         var oldQueryResult = API.queryItems(colPlayerFormation,
-            API.S("playerId").eq(playerId).and(API.S("dataId").eq(formationName)).and(API.S("itemId").eq(characterId)));
+            API.S("playerId").eq(playerId).and(API.S("dataId").eq(formationName)));
         var oldResult = oldQueryResult.cursor();
-        if (oldResult.hasNext())
+        while (oldResult.hasNext())
         {
-            oldFormationEntry = result.next();
-            oldFormation = oldFormationEntry.getData();
-            oldFormation.itemId = "";
-            oldFormationEntry.setData(oldFormation);
-            oldFormationEntry.persistor().persist().error();
+            var entry = oldResult.next();
+            var entryData = entry.getData();
+            if (entryData.itemId == characterId)
+            {
+                oldFormationEntry = entry;
+                oldFormation = entryData;
+                oldFormation.itemId = "";
+                oldFormationEntry.setData(oldFormation);
+                oldFormationEntry.persistor().persist().error();
+            }
         }
     }
     var formation;

modules/SERVICE_ITEM.js

@@ -419,7 +419,7 @@ function EquipItem(characterId, equipmentId, equipPosition)
             {
                 var unEquipItemDoc = unEquipItemCursor.next();
                 var unEquipItem = unEquipItemDoc.getData();
-                if (unEquipItem.equipItemId === characterId && unEquipItem.equipPosition === equipPosition)
+                if (unEquipItem.equipItemId == characterId && unEquipItem.equipPosition == equipPosition)
                 {
                     unEquipItem.equipItemId = "";
                     unEquipItem.equipPosition = "";