From 994382bf5004579225a8c4dfc4918a3a44398c33 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Thu, 30 Nov 2023 06:52:39 -0800
Subject: [PATCH] Always add head icon when adding avatars

---
 .../emu/lunarcore/game/avatar/AvatarStorage.java    | 13 +++++++++----
 src/main/java/emu/lunarcore/game/player/Player.java | 10 +---------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
index 2bd0b75..cdb4fbe 100644
--- a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
@@ -53,15 +53,20 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
         // Set owner first
         avatar.setOwner(getPlayer());
 
-        // Put into maps
+        // Put into avatar map
         this.avatars.put(avatar.getAvatarId(), avatar);
 
-        // Save to database
+        // Save to database and send packet
         avatar.save();
-
-        // Send packet
         getPlayer().sendPacket(new PacketPlayerSyncScNotify(avatar));
+        
+        // Add head icon
+        int headIconId = 200000 + avatar.getAvatarId();
+        if (GameData.getItemExcelMap().containsKey(headIconId)) {
+            getPlayer().addHeadIcon(headIconId);
+        }
 
+        // Done
         return true;
     }
     
diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java
index 55399be..be551e0 100644
--- a/src/main/java/emu/lunarcore/game/player/Player.java
+++ b/src/main/java/emu/lunarcore/game/player/Player.java
@@ -319,15 +319,7 @@ public class Player {
     }
 
     public boolean addAvatar(GameAvatar avatar) {
-        boolean success = getAvatars().addAvatar(avatar);
-        if (success) {
-            // Add profile picture of avatar
-            int headIconId = 200000 + avatar.getAvatarId();
-            if (GameData.getItemExcelMap().containsKey(headIconId)) {
-                this.addHeadIcon(headIconId);
-            }
-        }
-        return success;
+        return getAvatars().addAvatar(avatar);
     }
 
     public GameAvatar getAvatarById(int avatarId) {