From 839e18c2d002005d99d0c1cb05a6e09ddf09cdee Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Sat, 18 Nov 2023 19:09:56 -0800
Subject: [PATCH] Also sync hero basic type info when updating the main
 character avatar

---
 .../packet/send/PacketPlayerSyncScNotify.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java
index 52f588d..b6531bd 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java
@@ -40,11 +40,13 @@ public class PacketPlayerSyncScNotify extends BasePacket {
     public PacketPlayerSyncScNotify(GameAvatar avatar) {
         this();
 
-        var avatarSync = AvatarSync.newInstance()
-                .addAvatarList(avatar.toProto());
-
-        var data = PlayerSyncScNotify.newInstance()
-                .setAvatarSync(avatarSync);
+        var data = PlayerSyncScNotify.newInstance();
+        data.getMutableAvatarSync().addAvatarList(avatar.toProto());
+        
+        // Also update hero basic type info if were updating the main character
+        if (avatar.getHeroPath() != null) {
+            data.getMutableBasicTypeInfoList().add(avatar.getHeroPath().toProto());
+        }
 
         this.setData(data);
     }
@@ -52,11 +54,8 @@ public class PacketPlayerSyncScNotify extends BasePacket {
     public PacketPlayerSyncScNotify(GameAvatar avatar, GameItem item) {
         this();
 
-        var avatarSync = AvatarSync.newInstance()
-                .addAvatarList(avatar.toProto());
-
-        var data = PlayerSyncScNotify.newInstance()
-                .setAvatarSync(avatarSync);
+        var data = PlayerSyncScNotify.newInstance();
+        data.getMutableAvatarSync().addAvatarList(avatar.toProto());
 
         this.addItemToProto(data, item);