Fix ObjDesc to also take into account certain equipped ItemType.Cloth…

…ing items (#3757)
ACEmulator · Dec 21, 2021 · 1a20da1 · 1a20da1
1 parent ab6e165
commit 1a20da1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/ACE.Server/WorldObjects/Creature_Networking.cs b/Source/ACE.Server/WorldObjects/Creature_Networking.cs
@@ -108,8 +108,8 @@ public override ACE.Entity.ObjDesc CalculateObjDesc()
                     break;
             }
 
-            // get all the Armor Items so we can calculate their priority
-            var armorItems = EquippedObjects.Values.Where(x => (x.ItemType == ItemType.Armor)).ToList();
+            // get all the Armor Items, and any Clothing items that might be equipped (robes, slippers, gloves, kasa, etc) so we can calculate their priority
+            var armorItems = EquippedObjects.Values.Where(x => (x.ItemType == ItemType.Armor || (x.CurrentWieldedLocation & (EquipMask.Armor | EquipMask.Extremity)) != 0)).ToList();
             foreach (var w in armorItems)
                 w.setVisualClothingPriority();
 

diff --git a/Source/ACE.Server/WorldObjects/WorldObject_Properties.cs b/Source/ACE.Server/WorldObjects/WorldObject_Properties.cs
@@ -1261,7 +1261,7 @@ public CoverageMask? VisualClothingPriority
         /// </summary>
         public void setVisualClothingPriority()
         {
-            if (ClothingBase.HasValue && (CurrentWieldedLocation & (EquipMask.Armor | EquipMask.HandWear)) != 0)
+            if (ClothingBase.HasValue && (CurrentWieldedLocation & (EquipMask.Armor | EquipMask.Extremity)) != 0)
             {
                 ClothingTable item = DatManager.PortalDat.ReadFromDat<ClothingTable>((uint)ClothingBase);
                 VisualClothingPriority = item.GetVisualPriority();