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

Updated Upstream (Bukkit) (#8158)

Browse source
This commit is contained in:
Jake Potrebic 2022-07-21 12:53:04 -07:00 • committed by GitHub
parent c6313e659c
commit d0e7fa4dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 194 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/api/0007-Timings-v2.patch
View file

@ -3410,10 +3410,10 @@ index c580ec19cd2b55a4aeca49d9cd984ce7c2848cef..ab127d622b51e423883cbd9a7218f1cf
@NotNull
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8d1aa634c 100644
index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..763b3e9ea24b14c54abf94048931f29228c76df5 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -357,7 +357,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3421,7 +3421,7 @@ index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8
return result.toArray(new Plugin[result.size()]);
}
@@ -396,9 +395,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -397,9 +396,9 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@ -3433,7 +3433,7 @@ index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8
}
}
@@ -427,7 +426,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -428,7 +427,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
@ -3442,7 +3442,7 @@ index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8
}
@Override
@@ -645,7 +644,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -646,7 +645,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3452,7 +3452,7 @@ index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -860,7 +860,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -866,7 +866,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@ -3461,7 +3461,7 @@ index f5710d53296564eb4cd94382dc79f4c29769b672..fca73778c341df36becbf1ad1ad42ce8
}
/**
@@ -869,6 +869,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -875,6 +875,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {