sasheg/DeltaZern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILDTOOLS-251: Make much of Bukkit locale independent

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-06-26 19:31:59 +10:00
parent b54985de63
commit 7f7f1608e8
17 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java
+6 -6
View File
@@ -60,8 +60,8 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(String label, String fallbackPrefix, Command command) {
label = label.toLowerCase().trim();
fallbackPrefix = fallbackPrefix.toLowerCase().trim();
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
Iterator<String> iterator = command.getAliases().iterator();
@@ -128,7 +128,7 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
String sentCommandLabel = args[0].toLowerCase();
String sentCommandLabel = args[0].toLowerCase(java.util.Locale.ENGLISH);
Command target = getCommand(sentCommandLabel);
if (target == null) {
@@ -157,7 +157,7 @@ public class SimpleCommandMap implements CommandMap {
}
public Command getCommand(String name) {
Command target = knownCommands.get(name.toLowerCase());
Command target = knownCommands.get(name.toLowerCase(java.util.Locale.ENGLISH));
return target;
}
@@ -252,9 +252,9 @@ public class SimpleCommandMap implements CommandMap {
// We register these as commands so they have absolute priority.
if (targets.size() > 0) {
knownCommands.put(alias.toLowerCase(), new FormattedCommandAlias(alias.toLowerCase(), targets.toArray(new String[targets.size()])));
knownCommands.put(alias.toLowerCase(java.util.Locale.ENGLISH), new FormattedCommandAlias(alias.toLowerCase(java.util.Locale.ENGLISH), targets.toArray(new String[targets.size()])));
} else {
knownCommands.remove(alias.toLowerCase());
knownCommands.remove(alias.toLowerCase(java.util.Locale.ENGLISH));
}
}
}