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

Update B/CB

Browse source
This commit is contained in:
Shane Freeder 2017-07-10 14:04:41 +01:00
parent 1e4d3c3106
commit 18be9d24e4
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
17 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 9abf1bfaba8bf6b87b4d2c652a356b061764391c Mon Sep 17 00:00:00 2001
From feb30e1e5157616d1a66269983609d6fa9dc3241 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
@ -3504,7 +3504,7 @@ 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 e13d27d2..b43ffd36 100644
index a8b4db1c..de0ef125 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 {
@ -3543,7 +3543,7 @@ index e13d27d2..b43ffd36 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -714,7 +714,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -729,7 +729,7 @@ public final class SimplePluginManager implements PluginManager {
}
public boolean useTimings() {
@ -3552,7 +3552,7 @@ index e13d27d2..b43ffd36 100644
}
/**
@@ -723,6 +723,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -738,6 +738,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.2.windows.1
2.13.2

8
Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -1,4 +1,4 @@
From 15936361399b2a1b2fb350651eb83510875f955c Mon Sep 17 00:00:00 2001
From bac0e244d24ae13f16066fb8c866fea62ea88ad3 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -87,10 +87,10 @@ index c70d5129..040509c1 100644
+
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index d68e3bee..7aece13e 100644
index 9d7bdeef..21f898bf 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -747,4 +747,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -762,4 +762,13 @@ public final class SimplePluginManager implements PluginManager {
public void useTimings(boolean use) {
co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
}
@ -105,5 +105,5 @@ index d68e3bee..7aece13e 100644
+
}
--
2.13.0
2.13.2