diff --git a/.upstream-data b/.upstream-data index 2514ce0..62e7f89 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 3940c828a6e1945054ab8eeb747dbfcb99f6ccfd +purpurCommit = 9e436f732aae7f826c9acd5134a2948190c08b79 pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5 diff --git a/gradle.properties b/gradle.properties index 2451b08..483931e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.plazmamc.plazma version = 1.19.3-R0.1-SNAPSHOT -paperCommit = 5cc78f2b6f42132843b4fe02c3e509f727aa4714 +paperCommit = 4d7269e07cf152cd25943a17eaf1ced790bbb8ce org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 5c03218..9e79939 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Mon, 6 Mar 2023 09:28:59 +0000 +From: AlphaKR93 +Date: Fri, 10 Mar 2023 11:34:36 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri @@ -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 { diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index cb32112..bb9fe22 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Mon, 6 Mar 2023 09:30:48 +0000 +From: AlphaKR93 +Date: Fri, 10 Mar 2023 11:36:23 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC @@ -2160,7 +2160,7 @@ index cd3296fea01648592d2af89b3d80135acb6d0958..45797a6fbae1d8edc4211cb30def24ad permissions.put(lname, new PermissionAttachmentInfo(parent, lname, attachment, value)); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 90fdaee8b07df0acf8863103b47a1c68e38a3e4f..6319f6c1428d0e272681984c1b15ec05a3272423 100644 +index 6efa6732e5559c3192d08b8631911be7cdaf15b4..1cf1f761790a5e3cd9286b9cecab817ce58de352 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 36f54d5..72c1e7f 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Mon, 6 Mar 2023 09:28:59 +0000 +From: AlphaKR93 +Date: Fri, 10 Mar 2023 11:34:36 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index 7f22979..ae1fa55 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Mon, 6 Mar 2023 09:30:48 +0000 +From: AlphaKR93 +Date: Fri, 10 Mar 2023 11:36:23 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC @@ -20728,7 +20728,7 @@ index 4d7a2c4c1001aefe9fcd4be8dbcb414f721bfff9..2c7716a9d65ebda209a144b82c2126b6 + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c33e92cee1291c0ca1863fa8f33cd3b1c5449e92..4bce90ba8d2316fad9a8f89f06d17325d353667f 100644 +index c5078b9e4f1853126546c802ae29766e7dd4d151..33483f88a8c53f5ad29dcff0faa1a27995601474 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -20759,7 +20759,7 @@ index c33e92cee1291c0ca1863fa8f33cd3b1c5449e92..4bce90ba8d2316fad9a8f89f06d17325 return false; } -@@ -2273,6 +2282,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2284,6 +2293,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; } @@ -20788,7 +20788,7 @@ index c33e92cee1291c0ca1863fa8f33cd3b1c5449e92..4bce90ba8d2316fad9a8f89f06d17325 private void validateSpeed(float value) { if (value < 0) { if (value < -1f) { -@@ -3066,4 +3097,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3077,4 +3108,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end