Fix morph command (#4253)

ACEmulator · Dec 9, 2024 · 989b8c6 · 989b8c6
1 parent edcc7cd
commit 989b8c6
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Source/ACE.Server/Command/Handlers/AdminCommands.cs b/Source/ACE.Server/Command/Handlers/AdminCommands.cs
@@ -3541,12 +3541,25 @@ public static void HandleMorph(Session session, params string[] parameters)
                 foreach (var possession in possessions)
                     possessedBiotas.Add((possession.Biota, possession.BiotaDatabaseLock));
 
-                DatabaseManager.Shard.AddCharacterInParallel(player.Biota, player.BiotaDatabaseLock, possessedBiotas, player.Character, player.CharacterDatabaseLock, null);
+                // We must await here -- 
+                DatabaseManager.Shard.AddCharacterInParallel(player.Biota, player.BiotaDatabaseLock, possessedBiotas, player.Character, player.CharacterDatabaseLock, saveSuccess =>
+                {
+                    if (!saveSuccess)
+                    {
+                        CommandHandlerHelper.WriteOutputInfo(session, $"Failed to create a morph based on {weenie.ClassName} to a new character \"{player.Name}\" for the account \"{player.Account.AccountName}\"!", ChatMessageType.Broadcast);
+                        return;
+                    }
 
-                PlayerManager.AddOfflinePlayer(player);
-                session.Characters.Add(player.Character);
+                    PlayerManager.AddOfflinePlayer(player);
 
-                session.LogOffPlayer();
+                    session.Characters.Add(player.Character);
+
+                    var msg = $"Successfully created a morph based on {weenie.ClassName} to a new character \"{player.Name}\" for the account \"{player.Account.AccountName}\".";
+                    CommandHandlerHelper.WriteOutputInfo(session, msg, ChatMessageType.Broadcast);
+                    PlayerManager.BroadcastToAuditChannel(session.Player, msg);
+
+                    session.LogOffPlayer();
+                });
             });
         }