diff options
| author | Jake Potrebic <[email protected]> | 2023-02-21 19:27:49 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-21 21:27:49 -0600 |
| commit | bb63a6156d9f6c5d6ab018224934a3f5fbb29a89 (patch) | |
| tree | 3566dcae0fbb0fa9208e0636b1e809f6085121bd /patches/api/0010-Timings-v2.patch | |
| parent | ddc0a99f5215e583f794e726bb629b4ccc3116c6 (diff) | |
| download | Paper-bb63a6156d9f6c5d6ab018224934a3f5fbb29a89.tar.gz Paper-bb63a6156d9f6c5d6ab018224934a3f5fbb29a89.zip | |
Fix JavaPlugin static getPlugin methods (#8888)
Diffstat (limited to 'patches/api/0010-Timings-v2.patch')
| -rw-r--r-- | patches/api/0010-Timings-v2.patch | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch index 3d19a7239d..7e728cc868 100644 --- a/patches/api/0010-Timings-v2.patch +++ b/patches/api/0010-Timings-v2.patch @@ -3472,7 +3472,7 @@ index f64a90241ce7f73e111e6b5ac6ff87cd93583c0e..f13dcbe448111b24b36105d25527ba87 // Paper start diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index d0ad072c832b8fc8a1cfdcafdd42c724531a2e29..02062284dbc1a6c923ceffa5e4d6a3be8c7429d3 100644 +index fa39c93d76ebb9eecce1f4b5203cb361e4778b4f..aa6ce50ff2d0318bfcc328daa4fd9f2e50d34d01 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader { @@ -3514,18 +3514,6 @@ index d0ad072c832b8fc8a1cfdcafdd42c724531a2e29..02062284dbc1a6c923ceffa5e4d6a3be if (false) { // Spigot - RL handles useTimings check now eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index e721c58eafee2180d4ba1a73002cf850355a366e..39c9253d03bae99f8b5b19d22295f6172606d57b 100644 ---- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -31,6 +31,7 @@ import org.jetbrains.annotations.Nullable; - */ - @org.jetbrains.annotations.ApiStatus.Internal // Paper - public final class PluginClassLoader extends URLClassLoader implements io.papermc.paper.plugin.provider.classloader.ConfiguredPluginClassLoader { // Paper -+ public JavaPlugin getPlugin() { return plugin; } // Spigot - private final JavaPluginLoader loader; - private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>(); - private final PluginDescriptionFile description; diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java index 5ca863b3692b2e1b58e7fb4d82f554a92cc4f01e..612958a331575d1da2715531ebdf6b1168f2e860 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java |