Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +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

14
patches/server/0003-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 80f9b35413552c4aba3ba01a95290c55f4e77106..020927dfe9624453311d1d171a10f44344ec8710 100644
index d9ace6cd8e9cbf088e6664469fb94df0c964998f..f25c0557cf984b97e0ab361f579eccbf46f82170 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
@@ -20,7 +20,7 @@ index 80f9b35413552c4aba3ba01a95290c55f4e77106..020927dfe9624453311d1d171a10f443
exclude("io.papermc.paper", "paper-api")
}
// Pufferfish end
@@ -41,6 +41,9 @@ dependencies {
@@ -42,6 +42,9 @@ dependencies {
runtimeOnly("mysql:mysql-connector-java:8.0.29")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
@@ -30,7 +30,7 @@ index 80f9b35413552c4aba3ba01a95290c55f4e77106..020927dfe9624453311d1d171a10f443
runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
@@ -80,7 +83,7 @@ tasks.jar {
@@ -81,7 +84,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -39,7 +39,7 @@ index 80f9b35413552c4aba3ba01a95290c55f4e77106..020927dfe9624453311d1d171a10f443
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -152,7 +155,7 @@ fun TaskContainer.registerRunTask(
@@ -153,7 +156,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -193,7 +193,7 @@ index 68d16efaf9c2d997afabadcf1ee24c5de685b5b3..861cd9f092a19aca520c2be4ba7a6ee3
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7930217aa1275c4ae70f180d483a8714d43027e8..fe1833142d94b5c4c2b8d2295cf231422ac80dcb 100644
index c7fc5fcd28812fdc758842b06a6781b2c0e4f3cb..22c9cbb8f0d43650a8d021fac8b9efae4478c9e6 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
@@ -259,10 +259,10 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 637564f7b662d8b86772f5ba96c0cb6bc6c5fa43..99ecf59b25e67b9203ed35fefc96879e40875c59 100644
index 74fb5a9ae82ace67f7ced202b81bbe864f59308a..1395609e4656c4b6a1ca17f34eba1398c0927ee6 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() {