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

Update B/CB/S

Browse source
This commit is contained in:
Shane Freeder 2017-11-08 16:13:57 +00:00
parent d1d4f3b465
commit 1d03f56bd6
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
38 changed files with 216 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b Mon Sep 17 00:00:00 2001
From ca6ed8efa01a2413602e10e9d81b8187aee6013a 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
@ -3062,10 +3062,10 @@ index 08a9739f..347d2189 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 3f07d7f4..f89ad075 100644
index 50257883..9c80f464 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command {
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
public FormattedCommandAlias(String alias, String[] formatStrings) {
super(alias);
@ -3073,7 +3073,7 @@ index 3f07d7f4..f89ad075 100644
this.formatStrings = formatStrings;
}
@@ -118,6 +119,9 @@ public class FormattedCommandAlias extends Command {
@@ -113,6 +114,9 @@ public class FormattedCommandAlias extends Command {
return formatString;
}
@ -3195,7 +3195,7 @@ index 00000000..5527e7c8
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 71709126..b886cd82 100644
index 1b5b37bf..bdc0de8c 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 {
@ -3488,7 +3488,7 @@ index bba914d7..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bd2cc354..d2a78f56 100644
index 8af5f849..f4eff6b7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1520,6 +1520,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -3504,10 +3504,10 @@ index bd2cc354..d2a78f56 100644
@Override
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index b3bcda52..041a4cd7 100644
index 8b130abb..80c152ba 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3515,7 +3515,7 @@ index b3bcda52..041a4cd7 100644
return result.toArray(new Plugin[result.size()]);
}
@@ -329,7 +328,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -330,7 +329,7 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@ -3524,7 +3524,7 @@ index b3bcda52..041a4cd7 100644
}
return result;
@@ -355,7 +354,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -356,7 +355,7 @@ public final class SimplePluginManager implements PluginManager {
* @return Plugin if it exists, otherwise null
*/
public synchronized Plugin getPlugin(String name) {
@ -3533,7 +3533,7 @@ index b3bcda52..041a4cd7 100644
}
public synchronized Plugin[] getPlugins() {
@@ -553,7 +552,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -554,7 +553,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3543,7 +3543,7 @@ index b3bcda52..041a4cd7 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -729,7 +729,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -730,7 +730,7 @@ public final class SimplePluginManager implements PluginManager {
}
public boolean useTimings() {
@ -3552,7 +3552,7 @@ index b3bcda52..041a4cd7 100644
}
/**
@@ -738,6 +738,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -739,6 +739,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.13.0
2.14.3