From 809f33e75074e2af2e21fb049ce1a2d5970fae36 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 8 Aug 2022 19:31:24 -0500 Subject: [PATCH] revert classloader modification from pufferfish --- patches/api/0002-Fix-pufferfish-issues.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/patches/api/0002-Fix-pufferfish-issues.patch b/patches/api/0002-Fix-pufferfish-issues.patch index b2f08398c..ff14e5f6f 100644 --- a/patches/api/0002-Fix-pufferfish-issues.patch +++ b/patches/api/0002-Fix-pufferfish-issues.patch @@ -4,6 +4,19 @@ Date: Tue, 4 Jan 2022 23:05:41 -0600 Subject: [PATCH] Fix pufferfish issues +diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +index 4f736a267eb4c8a3bedb2d02fb30468484b991d5..8bddfbdcc947ffd4ff9a923fb8edf367c9a6b498 100644 +--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java ++++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +@@ -161,7 +161,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot + } + Class result = classes.get(name); + +- if (result == null && !this.closed) { // Pufferfish ++ if (result == null /*&& !this.closed*/) { // Pufferfish // Purpur - don't modify the classloader b.s. + String path = name.replace('.', '/').concat(".class"); + JarEntry entry = jar.getJarEntry(path); + diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java index bbe81f7a420f913ffdcad913a3c43ff41ead41f5..49de298146814fdf238929e10270ac6717dd73bd 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java