Skip to content

Commit e2922f5

Browse files
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2534e5c Fix other jigsaw related disconnect bug (#8414) PaperMC/Paper@e9618f8 Add system property to dump stack on bad plugin class access (#8417) PaperMC/Paper@6d14093 Add getDrops to BlockState and isPreferredTool to BlockData (#8284)
1 parent 955bd91 commit e2922f5

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group = org.purpurmc.purpur
22
version = 1.19.2-R0.1-SNAPSHOT
33

4-
paperCommit = f5fa69173cb59bf9fb4420163a25e305c7218b6b
4+
paperCommit = 6d1409316e7723f0d99f1192d4c5f24d48ab5eed
55

66
org.gradle.caching = true
77
org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
2020
along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
diff --git a/build.gradle.kts b/build.gradle.kts
23-
index e950bce5047552bdd3f5664eb24ce290b0a06225..10716b2c866631badb99b1fb79b66c62b117b038 100644
23+
index 428e7777906aa5177c5c6489838e6400349bb62f..c873a0537186ebe8a0fe2d15c7a7950793fd9a37 100644
2424
--- a/build.gradle.kts
2525
+++ b/build.gradle.kts
2626
@@ -41,6 +41,7 @@ dependencies {
@@ -476,7 +476,7 @@ index 8ff78fad47f6086aa289e32590f4fbec24b3d500..a16c841751bc44e46d27fc4efbfc2ab2
476476

477477
if (cloader instanceof PluginClassLoader) {
478478
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
479-
index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd13a50fe86 100644
479+
index 06daf7e7b9f177256a7a15b91e72ff53f89ccb68..0011c228b10316b09a62579dfc3d37794ee8e61a 100644
480480
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
481481
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
482482
@@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -488,15 +488,15 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
488488
static {
489489
ClassLoader.registerAsParallelCapable();
490490
}
491-
@@ -172,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
491+
@@ -177,6 +179,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
492492
throw new ClassNotFoundException(name);
493493
}
494494

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

@@ -505,15 +505,15 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
505505
String path = name.replace('.', '/').concat(".class");
506506
JarEntry entry = jar.getJarEntry(path);
507507

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

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

516-
@@ -234,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
516+
@@ -239,6 +243,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
517517
try {
518518
super.close();
519519
} finally {

0 commit comments

Comments
 (0)