Cleanup invite timers better. Improve thread safety of pawn loss handlers and use the right notices. Refactor some party internals. /party command for inspecting internal party state in case of desyncs. /finishquesttype for admin testing.

Fix double pawn lost announcement; adjust lost pawn wallet revive handler to be a bit more secure against failure.
Additional logging for investigating connection counts.
Fix exception thrown when shutting down the server.
Prevent Quick Chats from spamming globally; they default to party, plus other nearby players if you're in a hub area.
Refactor server list so that it hotloads properly and can handle downed servers without breaking.
Fix party state mangling associated with invitations failing due to timeout, rejection, and cancellation.
Deprecate naive lobby handling and remove the associated setting.
Add catch and logging for missing job info for CharacterCommon. Adjust ClientItemInfo.SubCategory to more cleanly handle items without a subtype. More logging for failures to find pawns by pawnId or slot index.

Author: RyanYappert

Arrowgene.Ddon.Cli/Command/ServerCommand.cs

@@ -178,6 +178,7 @@ public CommandResultType Run(CommandParameter parameter)
                 _webServer.Stop();
                 _gameServer.Stop();
                 _loginServer.Stop();
+                _database.Stop();
                 return CommandResultType.Completed;
             }
 
@@ -200,6 +201,11 @@ public void Shutdown()
             {
                 _webServer.Stop();
             }
+
+            if (_database is not null)
+            {
+                _database.Stop();
+            }
         }
     }
 }

Arrowgene.Ddon.GameServer/Characters/CharacterManager.cs

@@ -330,6 +330,12 @@ private void SelectPawns(Character character, DbConnection? connectionIn = null)
                     // Old DB is in use and new table not populated with required data for character
                     Logger.Error($"Character: AccountId={character.AccountId}, CharacterId={character.ContentCharacterId}, CommonId={character.CommonId}, PawnCommonId={pawn.CommonId} is missing table entry in 'ddon_orb_gain_extend_param'.");
                 }
+                if (pawn.PawnType != PawnType.Main)
+                {
+                    Logger.Error($"Character: AccountId={character.AccountId}, CharacterId={character.ContentCharacterId}, CommonId={character.CommonId}, PawnCommonId={pawn.CommonId} has invalid pawn type; locally setting pawn type back to Main.");
+                    pawn.PawnType = PawnType.Main;
+                }
+
                 UpdateCharacterExtendedParams(pawn, ownerCharacter: character);
             }
         }
@@ -359,10 +365,10 @@ public uint GetMaxAugmentAllocation(CharacterCommon character)
 
         public void UpdateCharacterExtendedParams(CharacterCommon characterCommon, bool newCharacter = false, Character ownerCharacter = null)
         {
-            var ExtendedParams = characterCommon.ExtendedParams;
+            var extendedParams = characterCommon.ExtendedParams;
 
             // There is always an implicit + 1 ring slot plus the extended params value
-            characterCommon.JewelrySlotNum = (byte)(CharacterManager.DEFAULT_RING_COUNT + ExtendedParams.JewelrySlot);
+            characterCommon.JewelrySlotNum = (byte)(CharacterManager.DEFAULT_RING_COUNT + extendedParams.JewelrySlot);
 
             /**
              * There are two physical attack traits and two magic attack traits in
@@ -371,20 +377,27 @@ public void UpdateCharacterExtendedParams(CharacterCommon characterCommon, bool
              * Similar distinction made with magic. The Gain* stats are extra stats
              * on top of the iniate stats. These come from armors and BO/HO trees.
              */
-            characterCommon.StatusInfo.GainAttack = ExtendedParams.Attack;
-            characterCommon.StatusInfo.GainDefense = ExtendedParams.Defence;
-            characterCommon.StatusInfo.GainMagicAttack = ExtendedParams.MagicAttack;
-            characterCommon.StatusInfo.GainMagicDefense = ExtendedParams.MagicDefence;
-            characterCommon.StatusInfo.GainStamina = ExtendedParams.StaminaMax;
-            characterCommon.StatusInfo.GainHP = ExtendedParams.HpMax;
+            characterCommon.StatusInfo.GainAttack = extendedParams.Attack;
+            characterCommon.StatusInfo.GainDefense = extendedParams.Defence;
+            characterCommon.StatusInfo.GainMagicAttack = extendedParams.MagicAttack;
+            characterCommon.StatusInfo.GainMagicDefense = extendedParams.MagicDefence;
+            characterCommon.StatusInfo.GainStamina = extendedParams.StaminaMax;
+            characterCommon.StatusInfo.GainHP = extendedParams.HpMax;
 
             /**
              * Additional stats can be earned from the S2 and S3 BO/HO orb trees.
              * The stat boosts rewarded for this mechanism rewards both stats for all jobs and stats for
              * a specific job only. We abuse JobId.None to store the stats for all jobs.
              */
             var extendedJobParams = characterCommon.ExtendedJobParams;
-            JobId jobId = characterCommon.ActiveCharacterJobData.Job;
+            JobId jobId = characterCommon.ActiveCharacterJobData?.Job ?? JobId.None;
+
+            if (jobId == JobId.None)
+            {
+                Logger.Error($"Character CommonId {characterCommon.CommonId} has no active job data.");
+                return;
+            }
+
             if (characterCommon is Pawn)
             {
                 extendedJobParams = ownerCharacter.ExtendedJobParams;
@@ -505,12 +518,12 @@ private PacketQueue NotifyClientOfCharacterStatus(GameClient client, CharacterCo
                 PawnPartyMember pawnPartyMember = (PawnPartyMember)partyMember;
                 if (client.Party != null)
                 {
-                    client.Party.EnqueueToAll(pawnPartyMember.GetS2CContextGetParty_ContextNtc(), queue);
+                    client.Party.EnqueueToAll(pawnPartyMember.GetPartyContext(), queue);
                 }
                 else
                 {
                     // This should never be true but if it is, why?
-                    client.Enqueue(pawnPartyMember.GetS2CContextGetParty_ContextNtc(), queue);
+                    client.Enqueue(pawnPartyMember.GetPartyContext(), queue);
                 }
             }
 

Arrowgene.Ddon.GameServer/Characters/HubManager.cs

@@ -31,27 +31,20 @@ public HashSet<GameClient> GetClientsInHub(StageLayoutId stageId)
 
         public HashSet<GameClient> GetClientsInHub(uint stageId)
         {
-            if (Server.GameSettings.GameServerSettings.NaiveLobbyContextHandling)
+            HashSet<GameClient> clients = new();
+            if (!HubMembers.ContainsKey(stageId))
             {
-                return Server.ClientLookup.GetAll().Distinct().ToHashSet();
+                return clients;
             }
-            else
+
+            foreach (GameClient client in Server.ClientLookup.GetAll())
             {
-                HashSet<GameClient> clients = new();
-                if (!HubMembers.ContainsKey(stageId))
+                if (client.Character != null && HubMembers[stageId].Contains(client.Character.CharacterId))
                 {
-                    return clients;
+                    clients.Add(client);
                 }
-                
-                foreach (GameClient client in Server.ClientLookup.GetAll())
-                {
-                    if (client.Character != null && HubMembers[stageId].Contains(client.Character.CharacterId))
-                    {
-                        clients.Add(client);
-                    }
-                }
-                return clients;
             }
+            return clients;
         }
 
         // The server maintains an authoritative list of who's in each hub stage.
@@ -62,13 +55,6 @@ public HashSet<GameClient> GetClientsInHub(uint stageId)
 
         public void UpdateLobbyContextOnStageChange(GameClient client, uint previousStageId, uint targetStageId)
         {
-            // Fallback to naive method.
-            if (Server.GameSettings.GameServerSettings.NaiveLobbyContextHandling)
-            {
-                NaiveLobbyHandling(client, previousStageId);
-                return;
-            }
-
             // Transitions that do not involve a hub stage don't concern us.
             if (!HubMembers.ContainsKey(previousStageId) && !HubMembers.ContainsKey(targetStageId))
             {
@@ -181,37 +167,5 @@ public void LeaveAllHubs(GameClient client)
                 hub.Remove(client.Character.CharacterId);
             }
         }
-
-        // A fallback to the existing mechanism; broadcast/gather the entire server on entry.
-        private void NaiveLobbyHandling(GameClient client, uint sourceStageId)
-        {
-            // Designed to only trigger once on joining the server, the only time your StageId == 0.
-            if (sourceStageId != 0)
-            {
-                return;
-            } 
-
-            HashSet<GameClient> targetClients = new HashSet<GameClient>();
-            HashSet<GameClient> gatherClients = new HashSet<GameClient>();
-
-            foreach (GameClient otherClient in Server.ClientLookup.GetAll())
-            {
-                if (otherClient.Character is null)
-                {
-                    continue;
-                }
-                targetClients.Add(otherClient);
-                gatherClients.Add(otherClient);
-            }
-
-            if (targetClients.Any())
-            {
-                SendContext(client, targetClients);
-            }
-            if (gatherClients.Any())
-            {
-                GatherContexts(gatherClients, client);
-            }
-        }
     }
 }

Arrowgene.Ddon.GameServer/Chat/ChatManager.cs

@@ -1,3 +1,4 @@
+using Arrowgene.Ddon.GameServer.Characters;
 using Arrowgene.Ddon.GameServer.Party;
 using Arrowgene.Ddon.Server;
 using Arrowgene.Ddon.Shared.Entity.PacketStructure;
@@ -165,6 +166,31 @@ private void Deliver(GameClient client, ChatResponse response)
             switch (response.Type)
             {
                 case LobbyChatMsgType.Say:
+                    // Quick-chats are local/party-shared.
+                    if (response.MessageFlavor > 0)
+                    {
+                        HashSet<GameClient> recipients;
+                        if (StageManager.IsHubArea(client.Character.Stage))
+                        {
+                            recipients = [.. (client.Party?.Clients ?? [])
+                                .Union(
+                                    _Server.ClientLookup.GetAll()
+                                    .Where(x => x.Character?.StageNo == client.Character?.StageNo)
+                                )];
+                        }
+                        else
+                        {
+                            recipients = [.. client.Party?.Clients ?? []];
+                        }
+                            
+                        response.Recipients.AddRange(recipients);
+                        break;
+                    }
+                    else
+                    {
+                        response.Recipients.AddRange(_Server.ClientLookup.GetAll());
+                        break;
+                    }
                 case LobbyChatMsgType.Shout:
                     response.Recipients.AddRange(_Server.ClientLookup.GetAll());
                     break;
@@ -183,7 +209,7 @@ private void Deliver(GameClient client, ChatResponse response)
                     }
 
                     response.Recipients.AddRange(_Server.ClientLookup.GetAll().Where(
-                        x => x.Character != null 
+                        x => x.Character != null
                         && client.Character != null
                         && x.Character.ClanId == client.Character.ClanId)
                     );
@@ -193,7 +219,7 @@ private void Deliver(GameClient client, ChatResponse response)
                 default:
                     response.Recipients.Add(client);
                     break;
-            }
+                }
 
             Send(response);
         }

Arrowgene.Ddon.GameServer/DdonGameServer.cs

@@ -174,6 +174,8 @@ ClientConnectionChangeArgs connectionChangeEventArgs
                     = new ClientConnectionChangeArgs(ClientConnectionChangeArgs.EventType.CONNECT, client);
                 connectionChangeEvent(this, connectionChangeEventArgs);
             }
+
+            Logger.Info($"ClientLookup, Connection: {ClientLookup.GetAll().Count}");
         }
 
         protected override void ClientDisconnected(GameClient client)
@@ -195,6 +197,8 @@ ClientConnectionChangeArgs connectionChangeEventArgs
                     = new ClientConnectionChangeArgs(ClientConnectionChangeArgs.EventType.DISCONNECT, client);
                 connectionChangeEvent(this, connectionChangeEventArgs);
             }
+
+            Logger.Info($"ClientLookup, Disconnect: {ClientLookup.GetAll().Count}");
         }
 
         public override GameClient NewClient(ITcpSocket socket)

Arrowgene.Ddon.GameServer/Handler/ConnectionReserveServerHandler.cs

@@ -32,6 +32,12 @@ public override S2CConnectionReserveServerRes Handle(GameClient client, C2SConne
                     $"The requested server {request.GameServerUniqueID} does not exist.");
             }
 
+            if (!Server.RpcManager.PingServer(request.GameServerUniqueID))
+            {
+                throw new ResponseErrorException(ErrorCode.ERROR_CODE_NET_NOT_CONNECT_GAME_SERVER,
+                    $"The requested server {request.GameServerUniqueID} did not respond when pinged.");
+            }
+
             var targetServerInfo = Server.RpcManager.ServerListInfo(request.GameServerUniqueID);
             if (targetServerInfo.LoginNum >= targetServerInfo.MaxLoginNum)
             {

Arrowgene.Ddon.GameServer/Handler/CraftResetCraftpointHandler.cs

@@ -24,7 +24,8 @@ public override S2CCraftResetCraftpointRes Handle(GameClient client, C2SCraftRes
             };
 
             Pawn pawn = client.Character.Pawns.Find(p => p.PawnId == request.PawnID)
-                ?? throw new ResponseErrorException(ErrorCode.ERROR_CODE_PAWN_NOT_FOUNDED);
+                ?? throw new ResponseErrorException(ErrorCode.ERROR_CODE_PAWN_NOT_FOUNDED,
+                $"Couldn't find pawn ID {request.PawnID}.");
             pawn.CraftData.CraftPoint = pawn.CraftData.CraftRank - 1;
             foreach (CDataPawnCraftSkill skill in pawn.CraftData.PawnCraftSkillList)
             {

Arrowgene.Ddon.GameServer/Handler/CraftSkillAnalyzeHandler.cs

@@ -59,7 +59,7 @@ public override S2CCraftSkillAnalyzeRes Handle(GameClient client, C2SCraftSkillA
                         {
                             craftSkillAnalyzeRes.AnalyzeResultList.Add(AnalyzeConsumableQuantity(itemInfo, craftPawns));
                         }
-                        else if (!CraftStartCraftHandler.NoQualitySubCategories.Contains((ItemSubCategory)itemInfo.SubCategory))
+                        else if (!CraftStartCraftHandler.NoQualitySubCategories.Contains(itemInfo.SubCategory))
                         {
                             craftSkillAnalyzeRes.AnalyzeResultList.Add(AnalyzeEquipmentQuality(itemInfo, craftPawns));
                         }

Arrowgene.Ddon.GameServer/Handler/CraftSkillUpHandler.cs

@@ -25,7 +25,8 @@ public override S2CCraftSkillUpRes Handle(GameClient client, C2SCraftSkillUpReq
             };
 
             Pawn pawn = client.Character.Pawns.Find(p => p.PawnId == request.PawnID)
-                ?? throw new ResponseErrorException(ErrorCode.ERROR_CODE_PAWN_NOT_FOUNDED);
+                ?? throw new ResponseErrorException(ErrorCode.ERROR_CODE_PAWN_NOT_FOUNDED,
+                $"Couldn't find pawn ID {request.PawnID}.");
 
             CDataPawnCraftSkill pawnCraftSkill = pawn.CraftData.PawnCraftSkillList.Find(skill => skill.Type == request.SkillType)
                 ?? throw new ResponseErrorException(ErrorCode.ERROR_CODE_CRAFT_INVALID_CRAFT_SKILL_TYPE);

Arrowgene.Ddon.GameServer/Handler/CraftStartCraftHandler.cs

@@ -98,7 +98,7 @@ public override S2CCraftStartCraftRes Handle(GameClient client, C2SCraftStartCra
                 double calculatedOdds = CraftManager.CalculateEquipmentQualityIncreaseRate(craftPawns);
                 uint plusValue = 0;
                 bool isGreatSuccessEquipmentQuality = false;
-                bool canPlusValue = !itemInfo.SubCategory.HasValue || !NoQualitySubCategories.Contains(itemInfo.SubCategory.Value);
+                bool canPlusValue = !NoQualitySubCategories.Contains(itemInfo.SubCategory);
                 if (canPlusValue && !string.IsNullOrEmpty(request.RefineMaterialUID))
                 {
                     Item refineMaterialItem = Server.Database.SelectStorageItemByUId(request.RefineMaterialUID, connection);