fix: if set main character as display avatar will cause null ptr

This commit is contained in:
StopWuyu
2025-08-23 14:45:23 +08:00
parent ae1c2f4f87
commit a4fd4489f0
2 changed files with 4 additions and 4 deletions

View File

@@ -17,9 +17,9 @@ public class HandlerSetAssistAvatarCsReq : Handler
{
if (id == 0) continue;
var avatarData = player.AvatarManager!.AvatarData.FormalAvatars.First(x =>
var avatarData = player.AvatarManager!.AvatarData.FormalAvatars.FirstOrDefault(x =>
x.BaseAvatarId == (int)id);
if (avatarData != null) avatars.Add(avatarData.AvatarId);
if (avatarData != null) avatars.Add(avatarData.BaseAvatarId);
}
await connection.SendPacket(new PacketSetAssistAvatarScRsp(req.AvatarIdList));

View File

@@ -17,9 +17,9 @@ public class HandlerSetDisplayAvatarCsReq : Handler
{
if (avatar.AvatarId == 0) continue;
var avatarData = player.AvatarManager!.AvatarData.FormalAvatars.First(x =>
var avatarData = player.AvatarManager!.AvatarData.FormalAvatars.FirstOrDefault(x =>
x.BaseAvatarId == (int)avatar.AvatarId);
if (avatarData != null) avatars.Add(avatarData.AvatarId);
if (avatarData != null) avatars.Add(avatarData.BaseAvatarId);
}
await connection.SendPacket(new PacketSetDisplayAvatarScRsp(req.DisplayAvatarList));