Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@27c0503 Correctly handle ArmorStand invisibility (#8944)
PaperMC/Paper@bf2053a Fix Player#setPlayerProfile (#8939)
PaperMC/Paper@4d7269e Correctly Remove Classloaders, Avoid Loading Providers in /paper dumpplugins, Fix library lookup (#8938)
This commit is contained in:
granny
2023-03-08 01:16:14 -08:00
parent ef4b73ced7
commit 9e436f732a
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -452,7 +452,7 @@ index 2b8308989fce7f8a16907f8711b362e671fdbfb6..bd4d1a40f53784662174d426533ef4b5
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 9a54f5bde27f1b77fd7b831100cb4e71d8ce4e29..6d91420290a1700d14d3932ab0d030ee48bebe11 100644
index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..6efa6732e5559c3192d08b8631911be7cdaf15b4 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -336,7 +336,9 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -476,19 +476,19 @@ index 9a54f5bde27f1b77fd7b831100cb4e71d8ce4e29..6d91420290a1700d14d3932ab0d030ee
if (cloader instanceof PluginClassLoader) {
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 7d300a539ac2ef1c773cfa90cecc8655490a8686..3ea600ade1e75cd1e2cdb30ae72335a0c8a4d86c 100644
index 86771934c76dd63b219069b045dbb5511ee0f45d..24ab015fbab6ce789999872791f7ffe4cc64d6d6 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -47,6 +47,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
private java.util.logging.Logger logger; // Paper - add field
@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
+ private boolean closed = false; // Pufferfish
+
static {
ClassLoader.registerAsParallelCapable();
}
@@ -181,6 +183,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
throw new ClassNotFoundException(name);
}
@@ -496,7 +496,7 @@ index 7d300a539ac2ef1c773cfa90cecc8655490a8686..3ea600ade1e75cd1e2cdb30ae72335a0
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -188,7 +191,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
}
Class<?> result = classes.get(name);
@@ -505,7 +505,7 @@ index 7d300a539ac2ef1c773cfa90cecc8655490a8686..3ea600ade1e75cd1e2cdb30ae72335a0
String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path);
@@ -235,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
this.setClass(name, result); // Paper
}
@@ -513,7 +513,7 @@ index 7d300a539ac2ef1c773cfa90cecc8655490a8686..3ea600ade1e75cd1e2cdb30ae72335a0
return result;
}
@@ -249,6 +253,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
// Paper end
super.close();
} finally {