cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes again (#3098) 

* Fixes again

* fish
This commit is contained in:
SolStar 2025-03-03 18:31:20 -05:00 committed by GitHub
parent 2bc0442ebd
commit 3a3f5b71da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Client/_RMC14/Mentor/StaffHelpUIController.cs
View File

@ -173,7 +173,12 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
var time1 = _messages.GetValueOrDefault(player1.SessionId); var time1 = _messages.GetValueOrDefault(player1.SessionId);
var time2 = _messages.GetValueOrDefault(player2.SessionId); var time2 = _messages.GetValueOrDefault(player2.SessionId);
if (time1 == null && time2 == null) if (time1 == null && time2 == null)
return 0; {
return string.Compare(
GetCharacterOrUsername(player2),
GetCharacterOrUsername(player1),
StringComparison.OrdinalIgnoreCase);
}
if (time1 == null) if (time1 == null)
return -1; return -1;
if (time2 == null) if (time2 == null)
@ -183,7 +188,8 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
foreach (var player in playerList) foreach (var player in playerList)
{ {
MentorAddPlayerButton(player); if (player.Connected)
MentorAddPlayerButton(player);
} }
// DeltaV - End all players in chat sorted // 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 //Default show player name if they don't have a character
var character = player.Username; var character = GetCharacterOrUsername(player);
var job = "Spectator"; var job = "Spectator";
//Use Character and Job name if they exist. //Use Job name if they exist.
if (!string.IsNullOrWhiteSpace(player.CharacterName))
character = player.CharacterName;
if (!string.IsNullOrWhiteSpace(player.StartingJob)) if (!string.IsNullOrWhiteSpace(player.StartingJob))
job = player.StartingJob; job = player.StartingJob;
// DeltaV - End show char name and job if possible // DeltaV - End show char name and job if possible
@ -326,4 +330,12 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged<Bwoin
if (_aHelp.GameAHelpButton != null) if (_aHelp.GameAHelpButton != null)
_aHelp.GameAHelpButton.Pressed = pressed; _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;
}
} }