aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0367-Also-load-resources-from-LibraryLoader.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2024-05-09 14:51:33 +0100
committerShane Freeder <[email protected]>2024-05-09 14:51:33 +0100
commit3693bbdc6b65e68db10375d3eeab70f06708b729 (patch)
tree4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/api/0367-Also-load-resources-from-LibraryLoader.patch
parentf2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff)
downloadPaper-timings/use-internals.tar.gz
Paper-timings/use-internals.zip
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally as this would allow us to avoid hitting systems like block state snapshots which can create issues as many of the spigot implementations of this stuff are increasingly broken, leading to unexpected crashes during ticking, even if the API cannot properly interact with these such states/items, it's generally more preferable to not crash the server in the course, and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/api/0367-Also-load-resources-from-LibraryLoader.patch')
-rw-r--r--patches/api/0367-Also-load-resources-from-LibraryLoader.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/api/0367-Also-load-resources-from-LibraryLoader.patch b/patches/api/0367-Also-load-resources-from-LibraryLoader.patch
new file mode 100644
index 0000000000..c2a41c2e53
--- /dev/null
+++ b/patches/api/0367-Also-load-resources-from-LibraryLoader.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nick Hensel <[email protected]>
+Date: Sun, 28 Aug 2022 23:44:18 +0200
+Subject: [PATCH] Also load resources from LibraryLoader
+
+
+diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+index de017d10db19ca7ca7f73ff0ac08fe6e1773d7dc..7e4f7cb2afbc145e532285c793573ad107bc3033 100644
+--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+@@ -109,14 +109,35 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+
+ @Override
+ public URL getResource(String name) {
+- return findResource(name);
++ // Paper start
++ URL resource = findResource(name);
++ if (resource == null && libraryLoader != null) {
++ return libraryLoader.getResource(name);
++ }
++ return resource;
++ // Paper end
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+- return findResources(name);
++ // Paper start
++ java.util.ArrayList<URL> resources = new java.util.ArrayList<>();
++ addEnumeration(resources, findResources(name));
++ if (libraryLoader != null) {
++ addEnumeration(resources, libraryLoader.getResources(name));
++ }
++ return Collections.enumeration(resources);
++ // Paper end
+ }
+
++ // Paper start
++ private <T> void addEnumeration(java.util.ArrayList<T> list, Enumeration<T> enumeration) {
++ while (enumeration.hasMoreElements()) {
++ list.add(enumeration.nextElement());
++ }
++ }
++ // Paper end
++
+ // Paper start
+ @Override
+ public Class<?> loadClass(@NotNull String name, boolean resolve, boolean checkGlobal, boolean checkLibraries) throws ClassNotFoundException {