OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update upstream B/CB/S

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/Timings-v2.patch
View file

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

2
work/Bukkit

@ -1 +1 @@
Subproject commit c3a46c9b8db54daf9425d73aa593e494f809bbde Subproject commit f0973327a93ed495f86e96a3e32bc5678b66a15d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 568e27fbd08cf5717ff23f01cc57c37f83ec8218 Subproject commit 0ebb9c7afa7b79222b7f6ec5fffcaa0aa41de7b9

2
work/Spigot

@ -1 +1 @@
Subproject commit 687a0190ef59611cca4cba981e17b4881c51df17 Subproject commit 5391d732ffc9118bda74005a22e90efd749b3983