Skip to content

Commit

Permalink
TPS Catchup feature
Browse files Browse the repository at this point in the history
  • Loading branch information
BloodredX authored Aug 25, 2024
1 parent 8da11ee commit 2c6ff75
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions patches/server/0009-Pufferfish-TPS-Catchup.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kevin Raneri <[email protected]>
Date: Wed, 27 Dec 2023 22:49:53 -0500
Subject: [PATCH] Pufferfish: TPS catchup


diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9599c5e25abf1d38e3151216180092b8511d6103..30907b63234642a4e760ae865c4a91e3162e52f2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1315,6 +1315,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("nextTickWait");
this.mayHaveDelayedTasks = true;
this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
+ // Pufferfish start - tps catchup
+ if (!in.bloodred.scatter.ScatterConfig.tpsCatchup) {
+ this.nextTickTimeNanos = currentTime + i;
+ this.delayedTasksMaxNextTickTimeNanos = nextTickTimeNanos;
+ }
+ // Pufferfish end
this.startMeasuringTaskExecutionTime();
this.waitUntilNextTick();
this.finishMeasuringTaskExecutionTime();

0 comments on commit 2c6ff75

Please sign in to comment.