Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 04:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Fully fix fairy clock for real this time (#2167)

Browse Source 
* Fully fix fairy clock For real this time

* Make it so relogging keeps the time lock state.

* Refactor out questLockTime

* Per Hartie, the client packet needs to be changed too

* Update src/main/java/emu/grasscutter/game/world/World.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
This commit is contained in:
Nazrin 2023-05-29 23:39:34 -07:00 committed by GitHub
parent 911993084e
commit 9b58105120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/emu/grasscutter/game/player/Player.java
View File

@ -339,7 +339,6 @@ public class Player implements PlayerHook, FieldFetch {
* @param gameTime The new game time. * @param gameTime The new game time.
*/ */
public void updatePlayerGameTime(long gameTime) { public void updatePlayerGameTime(long gameTime) {
if (this.getWorld().isTimeLocked()) return;
if (this.playerGameTime == gameTime) return; if (this.playerGameTime == gameTime) return;
// Update the game time. // Update the game time.

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

@ -483,8 +483,6 @@ public final class World implements Iterable<Player> {
// Update the world time. // Update the world time.
this.getWorldTime(); this.getWorldTime();
this.updateTime(); this.updateTime();
// Lock the world time.
this.lockTime(paused);
// If the world is being un-paused, update the last update time. // If the world is being un-paused, update the last update time.
if (this.isPaused != paused && !paused) { if (this.isPaused != paused && !paused) {