Skip to content

Treat a null shared display name as no character name #40

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbarlow97 merged 1 commit into from
Oct 12, 2026
Merged

Treat a null shared display name as no character name #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/games/voice/RpNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static String of(UUID id) {
private static String characterDisplay(Player player) {
try {
String display = Characters.displayName(player);
return !display.isBlank() ? display : null;
return display != null && !display.isBlank() ? display : null;
} catch (RuntimeException | LinkageError ex) {
if (!loggedFail) {
loggedFail = true;
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/net/tfminecraft/games/voice/VoiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,16 @@ void namesUseFreshSharedAliasesWithoutCanonicalCharacterLookups() {
}

@Test
void blankOrNullSharedDisplayUsesAccountName() {
void blankOrNullSharedDisplayUsesAccountNameWithoutLoggingAFailure() {
when(identity.displayName(player)).thenReturn(" ");
assertEquals("AccountName", RpNames.of(id));
when(identity.displayName(player)).thenReturn(null);
assertEquals("AccountName", RpNames.of(id));
try (var names = mockStatic(net.tfminecraft.tlibs.character.Characters.class)) {
names.when(() -> net.tfminecraft.tlibs.character.Characters.displayName(player)).thenReturn(null);
assertEquals("AccountName", RpNames.of(id));
}
verifyNoInteractions(logger);
}

@Test
Expand Down
Loading