Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper & Purpur)

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)

Purpur Changes:
PurpurMC/Purpur@ade1ed1 Updated Upstream (Paper)
PurpurMC/Purpur@ef4b73c Updated Upstream (Paper)
PurpurMC/Purpur@9e436f7 Updated Upstream (Paper)
This commit is contained in:
github-actions[bot]
2023-03-10 11:43:38 +00:00
parent b679f1f481
commit 64a7cf74f2
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@gmail.com>
Date: Mon, 6 Mar 2023 09:28:59 +0000
From: AlphaKR93 <dev@alpha93.kr>
Date: Fri, 10 Mar 2023 11:34:36 +0000
Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -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 88d852c1a729ffd5951da803da424b31591c9f9a..90fdaee8b07df0acf8863103b47a1c68e38a3e4f 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 88d852c1a729ffd5951da803da424b31591c9f9a..90fdaee8b07df0acf8863103b47a1c68
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 e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472ec8b6bc22 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 e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
@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 e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
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 e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
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 {