Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 01:22:54 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Move time lock check"

Browse Source 
This reverts commit acc69a33cc.
This commit is contained in:
KingRainbow44 2023-05-09 01:42:16 -04:00
parent 13d95c5c84
commit 061782f555
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/world/World.java
View File

@ -422,7 +422,7 @@ public final class World implements Iterable<Player> {
}
// 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<Player> {
* @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(