Fix login reply banned message. Fix character delete workflow.

ethanmoffat · May 28, 2024 · 3b2bbf3 · 3b2bbf3
1 parent 920c325
commit 3b2bbf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/EOLib/Domain/Character/CharacterManagementActions.cs b/EOLib/Domain/Character/CharacterManagementActions.cs
@@ -26,7 +26,7 @@ public CharacterManagementActions(IPacketSendService packetSendService,
         public async Task<int> RequestCharacterCreation()
         {
             var packet = new CharacterRequestClientPacket();
-            var response= await _packetSendService.SendEncodedPacketAndWaitAsync(packet);
+            var response = await _packetSendService.SendEncodedPacketAndWaitAsync(packet);
 
             if (response is CharacterReplyServerPacket responsePacket)
                 return (int)responsePacket.ReplyCode;
@@ -69,7 +69,7 @@ public async Task<int> RequestCharacterDelete()
             if (!(response is CharacterPlayerServerPacket responsePacket))
                 throw new EmptyPacketReceivedException();
 
-            return responsePacket.CharacterId;
+            return responsePacket.SessionId;
         }
 
         public async Task<CharacterReply> DeleteCharacter(int deleteRequestID)
@@ -86,7 +86,7 @@ public async Task<CharacterReply> DeleteCharacter(int deleteRequestID)
             if (!(response is CharacterReplyServerPacket responsePacket))
                 throw new EmptyPacketReceivedException();
 
-            if (responsePacket.ReplyCodeData is CharacterReplyServerPacket.ReplyCodeDataDeleted dataDeleted && dataDeleted.Characters.Any())
+            if (responsePacket.ReplyCodeData is CharacterReplyServerPacket.ReplyCodeDataDeleted dataDeleted)
             {
                 _characterSelectorRepository.Characters = dataDeleted.Characters
                     .Select(Character.FromCharacterSelectionListEntry).ToList();

diff --git a/EOLib/Domain/Login/LoginActions.cs b/EOLib/Domain/Login/LoginActions.cs
@@ -210,7 +210,7 @@ private static bool IsInvalidResponse(IPacket response, out LoginReplyServerPack
                     ReplyCode = LoginReply.Banned,
                     ReplyCodeData = new LoginReplyServerPacket.ReplyCodeDataBanned()
                 };
-                return true;
+                return false;
             }
 
             return !(response.Family == PacketFamily.Login && response.Action == PacketAction.Reply);