From 90c7e9252cdd28249efac6a98641087483e0cb5e Mon Sep 17 00:00:00 2001 From: OptimShi Date: Sun, 21 Apr 2024 11:23:59 -0700 Subject: [PATCH] Fix layering issues with armor/clothing (#4149) --- Source/ACE.Server/WorldObjects/Creature_Networking.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Server/WorldObjects/Creature_Networking.cs b/Source/ACE.Server/WorldObjects/Creature_Networking.cs index 50ddf1aa2d..6dc93122d0 100644 --- a/Source/ACE.Server/WorldObjects/Creature_Networking.cs +++ b/Source/ACE.Server/WorldObjects/Creature_Networking.cs @@ -121,7 +121,7 @@ public override ACE.Entity.ObjDesc CalculateObjDesc() var sortedArmorItems = bottom.Concat(noLayer).Concat(top).ToList(); var clothesAndCloaks = EquippedObjects.Values - .Where(x => (x.ItemType == ItemType.Clothing)) // FootWear & HandWear is included in the ArmorItems above + .Where(x => (x.ItemType == ItemType.Clothing) && (x.CurrentWieldedLocation & (EquipMask.Armor | EquipMask.Extremity)) == 0) // Extremity, Head/Foot/Hands, is included in the ArmorItems above .OrderBy(x => x.ClothingPriority); var eo = clothesAndCloaks.Concat(sortedArmorItems).ToList();