Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e9618f8 Add system property to dump stack on bad plugin class access (#8417)
  • Loading branch information
actions-user committed Oct 1, 2022
1 parent 669973e commit 5699aa7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = net.prismarineteam.prismarine
version = 1.19.2-R0.1-SNAPSHOT

paperCommit = 2534e5cbbfb062dedbe91046fce42b0de734fa84
paperCommit = e9618f878019c50109009f4814efb3589cfbb6a4

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
10 changes: 5 additions & 5 deletions patches/api/0001-Pufferfish-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ index 8ff78fad47f6086aa289e32590f4fbec24b3d500..a16c841751bc44e46d27fc4efbfc2ab2

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 f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd13a50fe86 100644
index 06daf7e7b9f177256a7a15b91e72ff53f89ccb68..0011c228b10316b09a62579dfc3d37794ee8e61a 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
Expand All @@ -487,15 +487,15 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
static {
ClassLoader.registerAsParallelCapable();
}
@@ -172,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -177,6 +179,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
throw new ClassNotFoundException(name);
}

+ public boolean _airplane_hasClass(@NotNull String name) { return this.classes.containsKey(name); } // Pufferfish
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -179,7 +182,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -184,7 +187,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
}
Class<?> result = classes.get(name);

Expand All @@ -504,15 +504,15 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path);

@@ -226,6 +229,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -231,6 +234,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
classes.put(name, result);
}

+ if (result == null) throw new ClassNotFoundException(name); // Pufferfish
return result;
}

@@ -234,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -239,6 +243,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
try {
super.close();
} finally {
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0003-Patina-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ index a16c841751bc44e46d27fc4efbfc2ab23cc7b0d7..1ab625ca3b392a94b34aeabbc3b752ee
+ // Prismarine end
}
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 2003a5fdf4cb3710f7b76ee435275cd13a50fe86..d7331e5c92100600c0d20571521580ac6b8825ad 100644
index 0011c228b10316b09a62579dfc3d37794ee8e61a..12fc90b265a38b170ddbda4bd0baebeed1266900 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -273,4 +273,6 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -278,4 +278,6 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
'}';
}
// Paper end
Expand Down Expand Up @@ -272,7 +272,7 @@ index 0000000000000000000000000000000000000000..6299e45ee89218566634431771a4c661
+}
\ No newline at end of file
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 49de298146814fdf238929e10270ac6717dd73bd..e29c57344e95fcc48b3c68b08d25a810cfa51864 100644
index 7769e19a5a86b5c76094058d31269fc6cc9f0ac3..2c767a4c6a7644e7affa6d54aeb123fec4db79bc 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -61,8 +61,9 @@ public class AnnotationTest {
Expand Down

0 comments on commit 5699aa7

Please sign in to comment.