Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes again #3098

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Fixes again #3098

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8cded
Fixes again
ewokswagger Mar 3, 2025
bdf18a6
fish
ewokswagger Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions Content.Client/_RMC14/Mentor/StaffHelpUIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,12 @@ public void ToggleWindow()
var time1 = _messages.GetValueOrDefault(player1.SessionId);
var time2 = _messages.GetValueOrDefault(player2.SessionId);
if (time1 == null && time2 == null)
return 0;
{
return -string.Compare(
GetCharacterOrUsername(player1),
GetCharacterOrUsername(player2),
StringComparison.OrdinalIgnoreCase);
}
if (time1 == null)
return -1;
if (time2 == null)
Expand All @@ -183,7 +188,8 @@ public void ToggleWindow()

foreach (var player in playerList)
{
MentorAddPlayerButton(player);
if (player.Connected)
MentorAddPlayerButton(player);
}
// DeltaV - End all players in chat sorted

Expand Down Expand Up @@ -261,11 +267,9 @@ private void MentorAddPlayerButton(PlayerInfo player)
*/

//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
Expand Down Expand Up @@ -326,4 +330,12 @@ private void SetAHelpButtonPressed(bool pressed)
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;
}
}
Loading