Update upstream B/CB/S

This commit is contained in:
Zach Brown
2016-06-26 14:13:00 -05:00
parent afb1926947
commit de4a16ead0
4 changed files with 7 additions and 7 deletions

View File

@@ -2944,8 +2944,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
*/
public boolean register(String label, String fallbackPrefix, Command command) {
+ command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Spigot
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);
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
return false;
@@ -3252,7 +3252,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (result != null) {
plugins.add(result);
- lookupNames.put(result.getDescription().getName(), result);
+ lookupNames.put(result.getDescription().getName().toLowerCase(), result); // Spigot
+ lookupNames.put(result.getDescription().getName().toLowerCase(java.util.Locale.ENGLISH), result); // Spigot
}
return result;
@@ -3261,7 +3261,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
*/
public synchronized Plugin getPlugin(String name) {
- return lookupNames.get(name.replace(' ', '_'));
+ return lookupNames.get(name.replace(' ', '_').toLowerCase()); // Spigot
+ return lookupNames.get(name.replace(' ', '_').toLowerCase(java.util.Locale.ENGLISH)); // Spigot
}
public synchronized Plugin[] getPlugins() {