Skip to content

fix: match island destinations across underscores and spaces #3103

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

Open
dannyward630 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: match island destinations across underscores and spaces #3103

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/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public static String resolveName(String typed, Set<String> names) {
* @return the normalized form
*/
private static String normalize(String s) {
return Util.stripColor(s).toLowerCase(Locale.ENGLISH).replaceAll("\\s+", " ").trim();
return Util.stripColor(s).toLowerCase(Locale.ENGLISH).replace('_', ' ').replaceAll("\\s+", " ").trim();
}

/**
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,22 @@ void testResolveNameCaseAndSpaceInsensitive() {
assertEquals("My Home", IslandGoCommand.resolveName("my HOME", Set.of("My Home", "Hut")));
}

/**
* Underscores and spaces are interchangeable when resolving destination names.
*/
@Test
void testResolveNameUnderscoreAndSpaceEquivalent() {
assertEquals("Happy Place", IslandGoCommand.resolveName("happy_place", Set.of("Happy Place", "Hut")));
}

/**
* Underscore normalization must not choose arbitrarily between equivalent names.
*/
@Test
void testResolveNameAmbiguousUnderscoreAndSpaceEquivalentReturnsNull() {
assertNull(IslandGoCommand.resolveName("HAPPY PLACE", Set.of("Happy Place", "Happy_Place")));
}

/**
* Test method for {@link IslandGoCommand#resolveName(String, Set)}
*/
Expand Down