mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2016-07-30 18:02:34 -05:00
parent c62efac3eb
commit 46bfd418a8
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
9 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From e5b3390ab5419f3585ef52c28b50153a75da9bed Mon Sep 17 00:00:00 2001
From 66c42230687e40a584225b2a7a1daf0857ab84de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -2964,10 +2964,10 @@ index 3f07d7f..f89ad07 100644
return i >= j && i <= k;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index f180da0..594deb9 100644
index e2fc282..66385c4 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
register("bukkit", new PluginsCommand("plugins"));
@ -2976,7 +2976,7 @@ index f180da0..594deb9 100644
}
public void setFallbackCommands() {
@@ -60,6 +60,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -59,6 +59,7 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(String label, String fallbackPrefix, Command command) {
@ -2984,7 +2984,7 @@ index f180da0..594deb9 100644
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -135,6 +136,12 @@ public class SimpleCommandMap implements CommandMap {
@@ -134,6 +135,12 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@ -3635,5 +3635,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.9.0
2.9.2.windows.1