Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@a76998d Fix plugin loggers on shutdown (#5592)
This commit is contained in:
BillyGalbreath
2022-08-22 15:55:20 -05:00
parent e599e96628
commit 868748e16f
17 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,7 +168,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
stringbuilder.append(CrashReport.getErrorComment());
stringbuilder.append("\n\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec7179929ca71 100644
index 92f685b1b6015cdd3e6c50fd39a79e2ad187fc91..98a166edfda01f5e07a144a34fd57f0e83b8893c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,7 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -189,7 +189,7 @@ index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec717
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1674,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1675,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -297,7 +297,7 @@ 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 522c519752d2fdb838bd797c77fdc7d0934b51e9..03382a35e5b22b871ba945687c4030c5cf091625 100644
index 05cc8f9cdcd7e920bf9503f68efb16cd74a359a2..0b248a987d22da21aa802c5dba00b4f987c365ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {