Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@afe633d convert API/server tests to mockito (#8848)
PaperMC/Paper@03a4e7a Updated Upstream (Bukkit/CraftBukkit) (#8832)
PaperMC/Paper@5c87711 Make sure Registry is loaded after Bukkit.setServer() (#8853)
This commit is contained in:
granny
2023-02-15 18:34:28 -08:00
parent 08aa4dccaa
commit c795c61137
14 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55f4e77106 100644
index 6a1853f3d988820f357c11371e32d50682e60401..d9ace6cd8e9cbf088e6664469fb94df0c964998f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -38,7 +38,7 @@ index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -41,6 +45,13 @@ dependencies {
@@ -42,6 +46,13 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
@@ -52,7 +52,7 @@ index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3")
@@ -49,6 +60,14 @@ dependencies {
@@ -50,6 +61,14 @@ dependencies {
}
val craftbukkitPackageVersion = "1_19_R2" // Paper
@@ -67,7 +67,7 @@ index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55
tasks.jar {
archiveClassifier.set("dev")
@@ -61,7 +80,7 @@ tasks.jar {
@@ -62,7 +81,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -3544,7 +3544,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfc4ee36befb925ab4eb6b96f5c1aa6c76bf711f..7930217aa1275c4ae70f180d483a8714d43027e8 100644
index f938095d999412d88fa3fcf76b87253034124cb9..c7fc5fcd28812fdc758842b06a6781b2c0e4f3cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -3556,7 +3556,7 @@ index bfc4ee36befb925ab4eb6b96f5c1aa6c76bf711f..7930217aa1275c4ae70f180d483a8714
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1065,6 +1065,11 @@ public final class CraftServer implements Server {
@@ -1066,6 +1066,11 @@ public final class CraftServer implements Server {
plugin.getDescription().getName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));
@@ -3581,10 +3581,10 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..009ab06182359862b8f543030ec4fe4e
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index daeaa30cdd64f5cb775304e82f2390684c02a9d3..637564f7b662d8b86772f5ba96c0cb6bc6c5fa43 100644
index c51a7f7489a37093e4096b28bfc1031ba6a2b8c2..74fb5a9ae82ace67f7ced202b81bbe864f59308a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -457,7 +457,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {