little cleanup about update logic also fix equipment dont showing on login

Author: WeylonSantana

Intersect.Client.Core/Interface/Game/Character/CharacterWindow.cs

@@ -363,28 +363,24 @@ private void UpdateEquippedItems(bool updateExtraBuffs = false)
 
         for (var i = 0; i < Options.Instance.Equipment.Slots.Count; i++)
         {
-            if (player.MyEquipment[i] > -1 && player.MyEquipment[i] < Options.Instance.Player.MaxInventory)
+            var invSlot = player.MyEquipment[i];
+            if (invSlot < 0 || invSlot >= Options.Instance.Player.MaxInventory)
             {
-                if (player.Inventory[player.MyEquipment[i]].ItemId != Guid.Empty)
-                {
-                    Items[i]
-                        .Update(
-                            player.Inventory[player.MyEquipment[i]].ItemId,
-                            player.Inventory[player.MyEquipment[i]].ItemProperties
-                        );
-                    if (updateExtraBuffs)
-                    {
-                        UpdateExtraBuffs(player.Inventory[player.MyEquipment[i]].ItemId);
-                    }
-                }
-                else
-                {
-                    Items[i].Update(Guid.Empty, mItemProperties);
-                }
+                Items[i].Update(Guid.Empty, mItemProperties);
+                continue;
             }
-            else
+
+            var item = player.Inventory[invSlot];
+            if (item.ItemId == Guid.Empty)
             {
                 Items[i].Update(Guid.Empty, mItemProperties);
+                continue;
+            }
+
+            Items[i].Update(item.ItemId, item.ItemProperties);
+            if (updateExtraBuffs)
+            {
+                UpdateExtraBuffs(item.ItemId);
             }
         }
     }

Intersect.Client.Core/Interface/Game/Character/EquipmentItem.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics;
+using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Gwen.Control;
 using Intersect.Client.Framework.Gwen.Control.EventArguments;
@@ -20,7 +22,7 @@ public partial class EquipmentItem
 
     private ItemProperties mItemProperties = null;
 
-    private bool mTexLoaded;
+    private string? _loadedTexture;
 
     private int mYindex;
 
@@ -110,32 +112,31 @@ public FloatRect RenderBounds()
 
     public void Update(Guid currentItemId, ItemProperties itemProperties)
     {
-        if (currentItemId != mCurrentItemId || !mTexLoaded)
+        if (!ItemDescriptor.TryGet(currentItemId, out var item))
         {
-            mCurrentItemId = currentItemId;
-            mItemProperties = itemProperties;
-            var item = ItemDescriptor.Get(mCurrentItemId);
-            if (item != null)
-            {
-                var itemTex = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Item, item.Icon);
-                if (itemTex != null)
-                {
-                    ContentPanel.Show();
-                    ContentPanel.Texture = itemTex;
-                    ContentPanel.RenderColor = item.Color;
-                }
-                else
-                {
-                    ContentPanel.Hide();
-                }
-            }
-            else
-            {
-                ContentPanel.Hide();
-            }
+            ContentPanel.Hide();
+            _loadedTexture = default;
+            return;
+        }
 
-            mTexLoaded = true;
+        if (currentItemId == mCurrentItemId && ContentPanel.Texture?.Name == _loadedTexture)
+        {
+            return;
         }
-    }
 
+        mCurrentItemId = currentItemId;
+        mItemProperties = itemProperties;
+
+        if (GameContentManager.Current.GetTexture(Framework.Content.TextureType.Item, item.Icon) is not { } itemTexture)
+        {
+            ContentPanel.Hide();
+            _loadedTexture = default;
+            return;
+        }
+
+        ContentPanel.Show();
+        ContentPanel.Texture = itemTexture;
+        ContentPanel.RenderColor = item.Color;
+        _loadedTexture = ContentPanel.Texture?.Name;
+    }
 }