2022-09-20 03:07:03 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Nick Hensel <nickhensel25@icloud.com>
|
|
|
|
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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index de017d10db19ca7ca7f73ff0ac08fe6e1773d7dc..7e4f7cb2afbc145e532285c793573ad107bc3033 100644
|
2022-09-20 03:07:03 +02:00
|
|
|
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
2023-10-26 23:56:40 +02:00
|
|
|
@@ -109,14 +109,35 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
2022-09-20 03:07:03 +02:00
|
|
|
|
|
|
|
@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
|
|
|
|
+
|
2023-02-19 15:57:10 +01:00
|
|
|
// Paper start
|
2022-09-20 03:07:03 +02:00
|
|
|
@Override
|
2023-02-19 15:57:10 +01:00
|
|
|
public Class<?> loadClass(@NotNull String name, boolean resolve, boolean checkGlobal, boolean checkLibraries) throws ClassNotFoundException {
|