Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper & Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@27c0503 Correctly handle ArmorStand invisibility (#8944)
PaperMC/Paper@bf2053a Fix Player#setPlayerProfile (#8939)
PaperMC/Paper@4d7269e Correctly Remove Classloaders, Avoid Loading Providers in /paper dumpplugins, Fix library lookup (#8938)

Purpur Changes:
PurpurMC/Purpur@ade1ed1 Updated Upstream (Paper)
PurpurMC/Purpur@ef4b73c Updated Upstream (Paper)
PurpurMC/Purpur@9e436f7 Updated Upstream (Paper)
This commit is contained in:
github-actions[bot]
2023-03-10 11:43:38 +00:00
parent b679f1f481
commit 64a7cf74f2
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.upstream-data
View File

@@ -1,2 +1,2 @@
purpurCommit = 3940c828a6e1945054ab8eeb747dbfcb99f6ccfd purpurCommit = 9e436f732aae7f826c9acd5134a2948190c08b79
pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5 pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.plazmamc.plazma group = org.plazmamc.plazma
version = 1.19.3-R0.1-SNAPSHOT version = 1.19.3-R0.1-SNAPSHOT
paperCommit = 5cc78f2b6f42132843b4fe02c3e509f727aa4714 paperCommit = 4d7269e07cf152cd25943a17eaf1ced790bbb8ce
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@gmail.com> From: AlphaKR93 <dev@alpha93.kr>
Date: Mon, 6 Mar 2023 09:28:59 +0000 Date: Fri, 10 Mar 2023 11:34:36 +0000
Subject: [PATCH] Pufferfish API Changes Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com> Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -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))); 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 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 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/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 { @@ -336,7 +336,9 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -476,19 +476,19 @@ index 88d852c1a729ffd5951da803da424b31591c9f9a..90fdaee8b07df0acf8863103b47a1c68
if (cloader instanceof PluginClassLoader) { 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 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 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/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 @@ -48,6 +48,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 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 + private boolean closed = false; // Pufferfish
+ +
static { static {
ClassLoader.registerAsParallelCapable(); 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); throw new ClassNotFoundException(name);
} }
@@ -496,7 +496,7 @@ index e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
@Override @Override
protected Class<?> findClass(String name) throws ClassNotFoundException { protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) { 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); Class<?> result = classes.get(name);
@@ -505,7 +505,7 @@ index e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
String path = name.replace('.', '/').concat(".class"); String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path); 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 this.setClass(name, result); // Paper
} }
@@ -513,7 +513,7 @@ index e89ab347b908cc92274dd5dd796a02249f899977..7329d2f27f3c2f89bb8f78771872472e
return result; 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 // Paper end
super.close(); super.close();
} finally { } finally {

6
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@gmail.com> From: AlphaKR93 <dev@alpha93.kr>
Date: Mon, 6 Mar 2023 09:30:48 +0000 Date: Fri, 10 Mar 2023 11:36:23 +0000
Subject: [PATCH] Purpur API Changes Subject: [PATCH] Purpur API Changes
Original: PurpurMC Original: PurpurMC
@@ -2160,7 +2160,7 @@ index cd3296fea01648592d2af89b3d80135acb6d0958..45797a6fbae1d8edc4211cb30def24ad
permissions.put(lname, new PermissionAttachmentInfo(parent, lname, attachment, value)); 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 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 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/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 { @@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {

4
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@gmail.com> From: AlphaKR93 <dev@alpha93.kr>
Date: Mon, 6 Mar 2023 09:28:59 +0000 Date: Fri, 10 Mar 2023 11:34:36 +0000
Subject: [PATCH] Pufferfish Server Changes Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com> Original: Kevin Raneri <kevin.raneri@gmail.com>

10
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@gmail.com> From: AlphaKR93 <dev@alpha93.kr>
Date: Mon, 6 Mar 2023 09:30:48 +0000 Date: Fri, 10 Mar 2023 11:36:23 +0000
Subject: [PATCH] Purpur Server Changes Subject: [PATCH] Purpur Server Changes
Original: PurpurMC Original: PurpurMC
@@ -20728,7 +20728,7 @@ index 4d7a2c4c1001aefe9fcd4be8dbcb414f721bfff9..2c7716a9d65ebda209a144b82c2126b6
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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 { @@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20759,7 +20759,7 @@ index c33e92cee1291c0ca1863fa8f33cd3b1c5449e92..4bce90ba8d2316fad9a8f89f06d17325
return false; 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; return this.getHandle().getAbilities().walkingSpeed * 2f;
} }
@@ -20788,7 +20788,7 @@ index c33e92cee1291c0ca1863fa8f33cd3b1c5449e92..4bce90ba8d2316fad9a8f89f06d17325
private void validateSpeed(float value) { private void validateSpeed(float value) {
if (value < 0) { if (value < 0) {
if (value < -1f) { 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; return this.spigot;
} }
// Spigot end // Spigot end