Skip to content

Configurable TPS catchup #14089

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

Merged
lynxplay merged 3 commits into from
Jul 26, 2026
+3 −1
Merged

Configurable TPS catchup #14089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba41c8b
Configurable TPS catchup
Biquaternions Jul 22, 2026
6d9c082
Use IntOr.Default
Biquaternions Jul 25, 2026
3a18d3a
Add constraint to be min 0
Biquaternions Jul 25, 2026
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
2 changes: 1 addition & 1 deletion paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@
+ final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(thisTickNanos, tickStart));
+ final long catchup = (long)Math.max(
+ 1,
+ 5 //ConfigHolder.getConfig().tickLoop.catchupTicks.getOrDefault(MoonriseConfig.TickLoop.DEFAULT_CATCHUP_TICKS).intValue()
+ io.papermc.paper.configuration.GlobalConfiguration.get().misc.catchupTicks.or(5)
+ );
+
+ // adjust ticksBehind so that it is not greater-than catchup
Expand Down
2 changes: 2 additions & 0 deletions paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ private void postProcess() {
}
}
public int maxJoinsPerTick = 5;
@Constraints.Min(0)
public IntOr.Default catchupTicks = IntOr.Default.USE_DEFAULT;
public boolean sendFullPosForItemEntities = false;
public boolean loadPermissionsYmlBeforePlugins = true;
@Constraints.Min(4)
Expand Down
Loading