Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the shortcut #266

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Use the shortcut #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions patches/server/0004-Backport-modern-tick-loop.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ index 088beb22b53ddf77dc182dd5ac39e1086d5279aa..6434b8613971a228fb0074390d8223bf
Thread thread = new Thread("Server Infinisleeper") {
{
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7d19ec833d61c2f75b5eb75d7eb291c7366a1a9a..2d3e52542cfec01ad7c3ca246ed087ef56bbcb35 100644
index 7d19ec833d61c2f75b5eb75d7eb291c7366a1a9a..d7b7b123380791d218b5c6bb113ccaadc0e6ffc5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -48,7 +48,7 @@ import org.bukkit.craftbukkit.Main;
Expand Down Expand Up @@ -436,7 +436,7 @@ index 7d19ec833d61c2f75b5eb75d7eb291c7366a1a9a..2d3e52542cfec01ad7c3ca246ed087ef
+ isOversleep = true;
+ this.controlTerminate(() -> !this.canOversleep());
+ isOversleep = false;
+ this.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.ticks+1));
+ new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.ticks+1).callEvent();
+ // PandaSpigot end

++this.ticks;
Expand All @@ -448,7 +448,7 @@ index 7d19ec833d61c2f75b5eb75d7eb291c7366a1a9a..2d3e52542cfec01ad7c3ca246ed087ef
+ // PandaSpigot start - Modern tick loop
+ long endTime = System.nanoTime();
+ long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
+ this.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.ticks, ((double)(endTime - lastTick) / 1000000D), remaining));
+ new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.ticks, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
+ // PandaSpigot end
this.methodProfiler.a("tallying");
this.h[this.ticks % 100] = System.nanoTime() - i;
Expand Down
Loading