Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@bd62f2c Fix chat messages being logged without formatting to console (#9058)
PaperMC/Paper@ce2a36d Fix PluginMeta#getDisplayName (#9038)
PaperMC/Paper@9940019 Deprecate public Timings classes for removal (#8949)
PaperMC/Paper@5c78e77 Fix api checking banned ips (#9026)
This commit is contained in:
granny
2023-03-27 21:33:51 -07:00
parent 7e014a84b5
commit f5a789d40b
19 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0276-Remove-Timings.patch
View File

@@ -77,10 +77,10 @@ index d2f0a0755317f5fa9a1ccf7db346aa77fd287d80..03852e7d21d9470a4469676367463fef
} catch (Exception exception) {
if (listener.shouldPropagateHandlingExceptions()) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244738091e5 100644
index 64b4397a3d91d9c5a29498e738c317f362106fec..123c7f9730a999ea5ea11de817fa61cc455e6962 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1407,15 +1407,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1408,15 +1408,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -99,7 +99,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1450,9 +1450,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1451,9 +1451,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
@@ -111,7 +111,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1473,7 +1473,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1474,7 +1474,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.frameTimer.logFrameDuration(k - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -120,7 +120,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
}
private ServerStatus buildServerStatus() {
@@ -1505,26 +1505,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1506,26 +1506,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickChildren(BooleanSupplier shouldKeepTicking) {
@@ -154,7 +154,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
// 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()) {
@@ -1544,7 +1544,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1545,7 +1545,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@@ -163,7 +163,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
this.isIteratingOverLevels = true; // Paper
Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
@@ -1569,14 +1569,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1570,14 +1570,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -180,7 +180,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1599,24 +1599,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1600,24 +1600,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@@ -211,7 +211,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
this.profiler.pop();
}
@@ -2802,7 +2802,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2805,7 +2805,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -220,7 +220,7 @@ index 41e19d9da784ec7360b2c1b271067721c70d6b41..28f608a813ce155c4f075092b417d244
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2829,7 +2829,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2832,7 +2832,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {