From 49725edd0ddd7724d0df8a43b46ac926dc381f72 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Sat, 18 May 2024 06:51:46 -0700
Subject: [PATCH] Fix items not displaying as equipped

---
 .../lunarcore/game/inventory/GameItem.java    | 33 ++++++++++++-------
 .../lunarcore/game/inventory/Inventory.java   |  6 ++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
index 55dde24..2629e0b 100644
--- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java
+++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
@@ -6,9 +6,7 @@ import java.util.List;
 
 import org.bson.types.ObjectId;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
+import dev.morphia.annotations.*;
 import emu.lunarcore.LunarCore;
 import emu.lunarcore.data.GameData;
 import emu.lunarcore.data.GameDepot;
@@ -54,8 +52,11 @@ public class GameItem {
     @Setter private int mainAffix;
     private List<GameItemSubAffix> subAffixes;
 
-    private int equipAvatar;
-    @Indexed private ObjectId equipAvatarId;
+    @Indexed private ObjectId equipAvatarId; // Object id of the avatar this item is equipped to
+    private transient GameAvatar equipAvatar;
+    
+    @LoadOnly @AlsoLoad("equipAvatar")
+    private int equipAvatarExcelId; // Deprecated legacy field
 
     @Deprecated
     public GameItem() {
@@ -153,11 +154,13 @@ public class GameItem {
     public boolean setEquipAvatar(GameAvatar avatar) {
         if (avatar == null && this.isEquipped()) {
             this.equipAvatarId = null;
-            this.equipAvatar = 0;
+            this.equipAvatar = null;
+            this.equipAvatarExcelId = 0; // Legacy field
             return true;
         } else if (this.equipAvatarId != avatar.getId()) {
             this.equipAvatarId = avatar.getId();
-            this.equipAvatar = 0;
+            this.equipAvatar = avatar;
+            this.equipAvatarExcelId = 0; // Legacy field
             return true;
         }
         
@@ -287,9 +290,12 @@ public class GameItem {
                 .setExp(this.getExp())
                 .setIsProtected(this.isLocked())
                 .setIsDiscarded(this.isDiscarded())
-                .setBaseAvatarId(this.getEquipAvatar())
-                .setEquipAvatarId(this.getEquipAvatar())
                 .setMainAffixId(this.mainAffix);
+        
+        if (this.getEquipAvatar() != null) {
+            proto.setBaseAvatarId(this.getEquipAvatar().getAvatarId());
+            proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId());
+        }
 
         if (this.subAffixes != null) {
             for (var subAffix : this.subAffixes) {
@@ -308,9 +314,12 @@ public class GameItem {
                 .setExp(this.getExp())
                 .setIsProtected(this.isLocked())
                 .setPromotion(this.getPromotion())
-                .setRank(this.getRank())
-                .setBaseAvatarId(this.getEquipAvatar())
-                .setEquipAvatarId(this.getEquipAvatar());
+                .setRank(this.getRank());
+        
+        if (this.getEquipAvatar() != null) {
+            proto.setBaseAvatarId(this.getEquipAvatar().getAvatarId());
+            proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId());
+        }
         
         return proto;
     }
diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
index f24ffa9..c2d067b 100644
--- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java
+++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
@@ -591,13 +591,13 @@ public class Inventory extends BasePlayerManager {
         putItem(item, tab);
 
         // Equip to a character if possible
-        if (item.isEquipped() || item.getEquipAvatar() > 0) {
+        if (item.isEquipped() || item.getEquipAvatarExcelId() > 0) {
             GameAvatar avatar = null;
             boolean hasEquipped = false;
             
-            if (item.getEquipAvatar() > 0) {
+            if (item.getEquipAvatarExcelId() > 0) {
                 // Legacy equip handler
-                avatar = getPlayer().getAvatars().getAvatarById(item.getEquipAvatar());
+                avatar = getPlayer().getAvatars().getAvatarById(item.getEquipAvatarExcelId());
                 item.setEquipAvatar(avatar);
                 item.save();
             } else {