Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@d9699b5 Configure mokitor Server mock as stubOnly (#8861)
PaperMC/Paper@8b37e9e update alternate current to v1.5.0 (#8882)
PaperMC/Paper@ddc0a99 Further clarify functionality of damageItemStack methods (#8878)
PaperMC/Paper@bb63a61 Fix JavaPlugin static getPlugin methods (#8888)
This commit is contained in:
granny
2023-02-21 23:05:26 -08:00
parent 0f3bbcbbbf
commit 9698422af2
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,10 +476,10 @@ 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 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd6635678763f3142a6 100644
index 7d300a539ac2ef1c773cfa90cecc8655490a8686..edc8e4b071c28a608d9f34cbc8e5b0fb7178e396 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -47,6 +47,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
private java.util.logging.Logger logger; // Paper - add field
private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
@@ -488,7 +488,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
static {
ClassLoader.registerAsParallelCapable();
}
@@ -177,6 +179,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -181,6 +183,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
throw new ClassNotFoundException(name);
}
@@ -496,7 +496,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -184,7 +187,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -188,7 +191,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
}
Class<?> result = classes.get(name);
@@ -505,7 +505,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path);
@@ -231,6 +234,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -235,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
this.setClass(name, result); // Paper
}
@@ -513,7 +513,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
return result;
}
@@ -245,6 +249,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -249,6 +253,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
// Paper end
super.close();
} finally {