From 061782f55596fa0e088c59fe903b8cad4edf6b21 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Tue, 9 May 2023 01:42:16 -0400 Subject: [PATCH] Revert "Move time lock check" This reverts commit acc69a33ccb82aab5e8df6337c7c6f028dacc8d8. --- src/main/java/emu/grasscutter/game/world/World.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java index 40bc9f9cf..53df23dde 100644 --- a/src/main/java/emu/grasscutter/game/world/World.java +++ b/src/main/java/emu/grasscutter/game/world/World.java @@ -422,7 +422,7 @@ public final class World implements Iterable { } // store updated world time every 60 seconds. (in-game hour) - if (this.tickCount % 60 == 0) { + if (this.tickCount % 60 == 0 && !this.timeLocked) { this.getHost().updatePlayerGameTime(this.currentWorldTime); } @@ -494,7 +494,7 @@ public final class World implements Iterable { * @param gameTime The time in game minutes. */ public void changeTime(long gameTime) { - if (!this.timeLocked) this.currentWorldTime = gameTime; + this.currentWorldTime = gameTime; // Trigger script events. this.players.forEach(