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@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

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

@@ -2783,7 +2783,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9 100644
index d2161a3c3b9a2b2d463ac778656c95167c10a49d..92f685b1b6015cdd3e6c50fd39a79e2ad187fc91 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,6 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2795,7 +2795,7 @@ index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf76524
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
@@ -1672,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1673,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -2804,7 +2804,7 @@ index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf76524
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -2251,6 +2253,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2252,6 +2254,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -5738,7 +5738,7 @@ index 909b2c98e7a9117d2f737245e4661792ffafb744..0d9e2b3728f9ab500bd5e44702718535
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 0a4e9b0957c9b0abbb88d472b5b3d7946c256af2..522c519752d2fdb838bd797c77fdc7d0934b51e9 100644
index 1628913b1e9b91e68dcd942a38da4aed95b12d4a..05cc8f9cdcd7e920bf9503f68efb16cd74a359a2 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 {