Handle main player avatar change

ethanmoffat · Jan 22, 2021 · ac44d39 · ac44d39
1 parent 863ab4a
commit ac44d39
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/EOLib/PacketHandlers/PlayerAvatarChangeHandler.cs b/EOLib/PacketHandlers/PlayerAvatarChangeHandler.cs
@@ -15,6 +15,7 @@ namespace EOLib.PacketHandlers
     public class PlayerAvatarChangeHandler : InGameOnlyPacketHandler
     {
         private readonly ICurrentMapStateRepository _currentMapStateRepository;
+        private readonly ICharacterRepository _characterRepository;
         private readonly IEIFFileProvider _eifFileProvider;
 
         public override PacketFamily Family => PacketFamily.Avatar;
@@ -23,22 +24,32 @@ public class PlayerAvatarChangeHandler : InGameOnlyPacketHandler
 
         public PlayerAvatarChangeHandler(IPlayerInfoProvider playerInfoProvider,
                                          ICurrentMapStateRepository currentMapStateRepository,
+                                         ICharacterRepository characterRepository,
                                          IEIFFileProvider eifFileProvider)
             : base(playerInfoProvider)
         {
             _currentMapStateRepository = currentMapStateRepository;
+            _characterRepository = characterRepository;
             _eifFileProvider = eifFileProvider;
         }
 
         public override bool HandlePacket(IPacket packet)
         {
             var playerID = packet.ReadShort();
             ICharacter currentCharacter;
-            try
+
+            if (_characterRepository.MainCharacter.ID == playerID)
+            {
+                currentCharacter = _characterRepository.MainCharacter;
+            }
+            else
             {
-                currentCharacter = _currentMapStateRepository.Characters.Single(x => x.ID == playerID);
+                try
+                {
+                    currentCharacter = _currentMapStateRepository.Characters.Single(x => x.ID == playerID);
+                }
+                catch (InvalidOperationException) { return false; }
             }
-            catch (InvalidOperationException) { return false; }
 
             var currentRenderProps = currentCharacter.RenderProperties;
 
@@ -85,8 +96,16 @@ public override bool HandlePacket(IPacket packet)
             }
 
             var updatedCharacter = currentCharacter.WithRenderProperties(currentRenderProps);
-            _currentMapStateRepository.Characters.Remove(currentCharacter);
-            _currentMapStateRepository.Characters.Add(updatedCharacter);
+
+            if (_characterRepository.MainCharacter.ID == playerID)
+            {
+                _characterRepository.MainCharacter = updatedCharacter;
+            }
+            else
+            {
+                _currentMapStateRepository.Characters.Remove(currentCharacter);
+                _currentMapStateRepository.Characters.Add(updatedCharacter);
+            }
 
             return true;
         }