From 0b2e471f9badcf950b78f866bca998b4c721a9bc Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Mon, 8 May 2023 02:24:05 -0400 Subject: [PATCH] Fix time locking --- src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java | 2 +- src/main/java/emu/grasscutter/game/world/World.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java index 351b8e902..faba81e32 100644 --- a/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java +++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestExec.java @@ -17,7 +17,7 @@ public enum QuestExec implements QuestTrigger { QUEST_EXEC_REFRESH_GROUP_MONSTER(7), QUEST_EXEC_SET_IS_FLYABLE(8), QUEST_EXEC_SET_IS_WEATHER_LOCKED(9), // missing - QUEST_EXEC_SET_IS_GAME_TIME_LOCKED(10), // missing + QUEST_EXEC_SET_IS_GAME_TIME_LOCKED(10), QUEST_EXEC_SET_IS_TRANSFERABLE(11), // missing, currently unused QUEST_EXEC_GRANT_TRIAL_AVATAR(12), QUEST_EXEC_OPEN_BORED(13), // missing, currently unused diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java index 7f83e7d0e..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); }