aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0473-Add-hook-to-remap-library-jars.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/0473-Add-hook-to-remap-library-jars.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/0473-Add-hook-to-remap-library-jars.patch')
-rw-r--r--patches/api/0473-Add-hook-to-remap-library-jars.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/api/0473-Add-hook-to-remap-library-jars.patch b/patches/api/0473-Add-hook-to-remap-library-jars.patch
new file mode 100644
index 0000000000..fe1609629e
--- /dev/null
+++ b/patches/api/0473-Add-hook-to-remap-library-jars.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Sun, 28 Apr 2024 13:51:08 -0700
+Subject: [PATCH] Add hook to remap library jars
+
+
+diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+index 5b0203e908f84c531886b8ea8faeb591eb045636..8e1b6be2462aaa692efa1f72986921a6dc357196 100644
+--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+@@ -47,6 +47,7 @@ public class LibraryLoader
+ private final DefaultRepositorySystemSession session;
+ private final List<RemoteRepository> repositories;
+ public static java.util.function.BiFunction<URL[], ClassLoader, URLClassLoader> LIBRARY_LOADER_FACTORY; // Paper - rewrite reflection in libraries
++ public static java.util.function.Function<List<java.nio.file.Path>, List<java.nio.file.Path>> REMAPPER; // Paper - remap libraries
+
+ public LibraryLoader(@NotNull Logger logger)
+ {
+@@ -111,9 +112,18 @@ public class LibraryLoader
+ }
+
+ List<URL> jarFiles = new ArrayList<>();
++ List<java.nio.file.Path> jarPaths = new ArrayList<>(); // Paper - remap libraries
+ for ( ArtifactResult artifact : result.getArtifactResults() )
+ {
+- File file = artifact.getArtifact().getFile();
++ // Paper start - remap libraries
++ jarPaths.add(artifact.getArtifact().getFile().toPath());
++ }
++ if (REMAPPER != null) {
++ jarPaths = REMAPPER.apply(jarPaths);
++ }
++ for (java.nio.file.Path path : jarPaths) {
++ File file = path.toFile();
++ // Paper end - remap libraries
+
+ URL url;
+ try