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

18
patches/server/0288-Remove-Timings.patch
View File

@@ -103,10 +103,10 @@ index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..e8efbbeece7e866c6c4d7489677d2d9e
PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab2541cfd3b6 100644
index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc401aeaa9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1427,15 +1427,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1428,15 +1428,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -125,7 +125,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1487,9 +1487,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1488,9 +1488,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -137,7 +137,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1511,29 +1511,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1512,29 +1512,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.frameTimer.logFrameDuration(i1 - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -175,7 +175,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Send time updates to everyone, it will get the right time from the world the player is in.
// Paper start - optimize time updates
for (final ServerLevel world : this.getAllLevels()) {
@@ -1553,7 +1553,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1554,7 +1554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@@ -184,7 +184,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
this.isIteratingOverLevels = true; // Paper
while (iterator.hasNext()) {
@@ -1577,14 +1577,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1578,14 +1578,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -201,7 +201,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1607,24 +1607,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1608,24 +1608,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@@ -232,7 +232,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
this.profiler.pop();
}
@@ -2783,7 +2783,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2784,7 +2784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -241,7 +241,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2810,7 +2810,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2811,7 +2811,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {