From 3a3f5b71da46977490b18d141fc0da22bb9765e5 Mon Sep 17 00:00:00 2001
From: SolStar <44028047+ewokswagger@users.noreply.github.com>
Date: Mon, 3 Mar 2025 18:31:20 -0500
Subject: [PATCH] Fixes again (#3098)

* Fixes again

* fish
---
 .../_RMC14/Mentor/StaffHelpUIController.cs    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs b/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs
index 58359c4b47..67dd0251ef 100644
--- a/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs
+++ b/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs
@@ -173,7 +173,12 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
                         var time1 = _messages.GetValueOrDefault(player1.SessionId);
                         var time2 = _messages.GetValueOrDefault(player2.SessionId);
                         if (time1 == null && time2 == null)
-                            return 0;
+                        {
+                            return string.Compare(
+                                GetCharacterOrUsername(player2),
+                                GetCharacterOrUsername(player1),
+                                StringComparison.OrdinalIgnoreCase);
+                        }
                         if (time1 == null)
                             return -1;
                         if (time2 == null)
@@ -183,7 +188,8 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
 
                     foreach (var player in playerList)
                     {
-                        MentorAddPlayerButton(player);
+                        if (player.Connected)
+                            MentorAddPlayerButton(player);
                     }
                     // DeltaV - End all players in chat sorted
 
@@ -261,11 +267,9 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
         */
 
         //Default show player name if they don't have a character
-        var character = player.Username;
+        var character = GetCharacterOrUsername(player);
         var job = "Spectator";
-        //Use Character and Job name if they exist.
-        if (!string.IsNullOrWhiteSpace(player.CharacterName))
-            character = player.CharacterName;
+        //Use Job name if they exist.
         if (!string.IsNullOrWhiteSpace(player.StartingJob))
             job = player.StartingJob;
         // DeltaV - End show char name and job if possible
@@ -326,4 +330,12 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
         if (_aHelp.GameAHelpButton != null)
             _aHelp.GameAHelpButton.Pressed = pressed;
     }
+
+    //DeltaV Add player identity method
+    private string GetCharacterOrUsername(PlayerInfo player)
+    {
+        if (!string.IsNullOrWhiteSpace(player.CharacterName))
+            return player.CharacterName;
+        return player.Username;
+    }
 }