Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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@a15152e Allow old behavior for CommandRegisteredEvent (#8249)
PaperMC/Paper@0118c0b Improve MojangAPI docs and replace @Deprecated with @ApiStatus.Experimental on draft APIs (#8261)
PaperMC/Paper@3624637 Improve documentation of Inventory#removeItem (#8263)
PaperMC/Paper@a47301e Fix Player#chat kicking all clients (#8262)
PaperMC/Paper@78b19f8 Separate Command Sending to Separate Thread Pool (#8170)
This commit is contained in:
BillyGalbreath
2022-08-08 09:23:12 -05:00
parent 7e7693cb64
commit 28e3713086
23 changed files with 90 additions and 90 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 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615bb2604f52 100644
index 1c77d96f51e32fff7907f372f2303266cb6d0c77..04e9d7aff458e59a43df6830ff82ac9d5708ee47 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1426,15 +1426,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1427,15 +1427,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -125,7 +125,7 @@ index 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1486,9 +1486,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1487,9 +1487,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 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1510,29 +1510,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1511,29 +1511,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 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
// 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()) {
@@ -1552,7 +1552,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1553,7 +1553,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@@ -184,7 +184,7 @@ index 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
this.isIteratingOverLevels = true; // Paper
while (iterator.hasNext()) {
@@ -1576,14 +1576,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1577,14 +1577,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -201,7 +201,7 @@ index 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1606,24 +1606,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1607,24 +1607,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@@ -232,7 +232,7 @@ index 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
this.profiler.pop();
}
@@ -2766,7 +2766,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2767,7 +2767,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -241,7 +241,7 @@ index 6f13001b2ffa6a54aa6cc182084159215a67b31d..a9caa5529c91f8f1adaea8ae9ba0615b
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2793,7 +2793,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2794,7 +2794,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {