Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@8bc0574 Bump kyori's ansi to fix color bleed (#9346)
PaperMC/Paper@f7b386d Use ANSI serializer for console completion descriptions (#9351)
PaperMC/Paper@41e6f20 Updated Upstream (Bukkit/CraftBukkit) (#9342)
PaperMC/Paper@b134eb4 Fix incorrect annotation on BrushableBlock#getItem (#9345)
PaperMC/Paper@fa674f3 Don't enforce icanhasbukkit default if alias block exists (#9334)
PaperMC/Paper@81834ac Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@f6139de Fix sniffer removeExploredLocation and javadoc (#9311)
PaperMC/Paper@17966dd Update the server logo (#9264)
PaperMC/Paper@02e3b5a chore(api): add missing javadoc urls (#9355)
PaperMC/Paper@3f237e8 Fix IntegerUtil#getDivisorNumbers
PaperMC/Paper@f555138 Make sure to post process chunks before they are sent to players
PaperMC/Paper@a226f44 Copy itemstack when sanitizing for datawatcher items
PaperMC/Paper@3885666 Remove stacktrace on exception from reading server.properties (#9296)
This commit is contained in:
Ben Kerllenevich
2023-06-17 09:33:51 -04:00
parent 2e5dcc63d3
commit fa3166a24d
23 changed files with 388 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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 a0c5592530d2a59bfde87d1e9eb3752e7d4694da..a3da1d0c043ad4f8786ba6c4e25077e14efec364 100644
index 19186e436cd6a5f00f0b42ac11f8050ad2ef6713..db418d96f8eee731b9ed29e51cb7ac0ff1ad529b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -38,7 +38,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..a3da1d0c043ad4f8786ba6c4e25077e1
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -43,6 +47,13 @@ dependencies {
@@ -44,6 +48,13 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
@@ -52,7 +52,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..a3da1d0c043ad4f8786ba6c4e25077e1
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")
@@ -51,6 +62,14 @@ dependencies {
@@ -52,6 +63,14 @@ dependencies {
}
val craftbukkitPackageVersion = "1_20_R1" // Paper
@@ -67,7 +67,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..a3da1d0c043ad4f8786ba6c4e25077e1
tasks.jar {
archiveClassifier.set("dev")
@@ -63,7 +82,7 @@ tasks.jar {
@@ -64,7 +83,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -3456,7 +3456,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 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..ac0684aebef870246e94f623f7a16066f8a3a418 100644
index 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..c9ebcfffa6b958a117a2112ab181937dfcf48c1a 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
@@ -3468,7 +3468,7 @@ index 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..ac0684aebef870246e94f623f7a16066
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1062,6 +1062,11 @@ public final class CraftServer implements Server {
@@ -1066,6 +1066,11 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"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."
));