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@b8edb0e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
PaperMC/Paper@b4e3b3d Allow non-op players to execute the click event callback (#9652)
This commit is contained in:
granny
2023-08-29 03:15:55 -07:00
parent 6e2126ffcb
commit 423c2af60c
17 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0268-Remove-Timings.patch
View File

@@ -56,10 +56,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 fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a0250a5435b7 100644
index 1d6843b376d626e2db8565d15e02bf4c93be30e3..629d870e6b501969d72e48500ea3c06c3bf3fe4d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -314,7 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -313,7 +313,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
public boolean isIteratingOverLevels = false; // Paper
@@ -68,7 +68,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - optimize mob spawning
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
@@ -1405,15 +1405,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1404,15 +1404,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -87,7 +87,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1448,9 +1448,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1447,9 +1447,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
@@ -99,7 +99,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1471,7 +1471,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1470,7 +1470,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.frameTimer.logFrameDuration(k - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -108,7 +108,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
}
private ServerStatus buildServerStatus() {
@@ -1503,9 +1503,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1502,9 +1502,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickChildren(BooleanSupplier shouldKeepTicking) {
@@ -120,7 +120,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
getAllLevels().forEach(level -> {
@@ -1522,21 +1522,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1521,21 +1521,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - Folia scheduler API
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
this.profiler.push("commandFunctions");
@@ -147,7 +147,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
// 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 level : this.getAllLevels()) {
@@ -1556,7 +1556,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1555,7 +1555,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@@ -156,7 +156,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
this.isIteratingOverLevels = true; // Paper
Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
@@ -1581,14 +1581,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1580,14 +1580,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -173,7 +173,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1611,24 +1611,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1610,24 +1610,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@@ -204,7 +204,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
this.profiler.pop();
}
@@ -2815,7 +2815,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2814,7 +2814,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -213,7 +213,7 @@ index fb52feb1028747caf942dd534b6f994bfb94ffa5..9711ba8466e939a047c6656231a5a025
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2842,7 +2842,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2841,7 +2841,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {
@@ -236,10 +236,10 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..aa3f4ca3be843616d34897e41909255f
i = this.context.runTopCommand(function, source);
} finally {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index af8294476cb0fc322641bbe4168c4b0c020f39fd..fa258f1a15a93db0c3401397433b184938412a9b 100644
index 38e2c279d6a846a4d76c15e495bdf464bfcd5b96..1d67581af0a8cc417ddf5d0a9e68e83c5b845ae3 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -523,7 +523,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -522,7 +522,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
public void handleConsoleInputs() {
@@ -248,7 +248,7 @@ index af8294476cb0fc322641bbe4168c4b0c020f39fd..fa258f1a15a93db0c3401397433b1849
// Paper start - use proper queue
ConsoleInput servercommand;
while ((servercommand = this.serverCommandQueue.poll()) != null) {
@@ -540,7 +540,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -539,7 +539,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// CraftBukkit end
}
@@ -341,7 +341,7 @@ index 3770ced0b227f7eea1f04d6afd5c14331f6a1480..f4e1fc878ecf72dafade1c72869c9656
}
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index ef6c98c7949d2feb3ec2a0b2be161978989b6771..2b13f177d154ff322837e055e15fcb55941a2306 100644
index fe1a9c646b09d11e7fa2186afbeb70b680ad2b57..14613af193b178133fd688f26a766b36fa969590 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -299,10 +299,10 @@ public class ServerChunkCache extends ChunkSource {