Skip to content

Commit de00a94

Browse files
committed
Make ServerClockManager getGameTime directly retrieve game time
The overworld game time must be able to be retrieved for regions in worlds that are not the overworld, so we need to bypass the region gametime retrieval.
1 parent ad40bfa commit de00a94

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14357,6 +14357,19 @@ index 08b59be32ff3fee1afd45f727e601fec3b4bfb0b..c25b71397b57d4077f86b37cfa42e9b2
1435714357
}
1435814358

1435914359
@Override
14360+
diff --git a/net/minecraft/world/clock/ServerClockManager.java b/net/minecraft/world/clock/ServerClockManager.java
14361+
index c1defe73d20080fa00a68e0267ff0e3dfb3c245a..3b37b8fedba1fcbfe7d9c59fc859b9ea63d9b8c0 100644
14362+
--- a/net/minecraft/world/clock/ServerClockManager.java
14363+
+++ b/net/minecraft/world/clock/ServerClockManager.java
14364+
@@ -156,7 +156,7 @@ public class ServerClockManager extends SavedData implements ClockManager {
14365+
}
14366+
14367+
private long getGameTime() {
14368+
- return this.server.overworld().getGameTime();
14369+
+ return this.server.overworld().levelData.getGameTime(); // Folia - region threading
14370+
}
14371+
14372+
public boolean isAtTimeMarker(final Holder<WorldClock> clock, final ResourceKey<ClockTimeMarker> timeMarkerId) {
1436014373
diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
1436114374
index 31613a27b7daf8921a7a627c725e4cd521e16760..417d9d8264e73a9dd1b26512f714b277fadc735f 100644
1436214375
--- a/net/minecraft/world/damagesource/CombatTracker.java

0 commit comments

Comments
 (0)