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

Fix changing time + Trigger time change condition

Browse Source
This commit is contained in:
KingRainbow44 2023-05-04 01:05:03 -04:00
parent 312c98ee19
commit 8bb7ae22d0
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,12 @@ public class Player {
if (this.playerGameTime == gameTime) return; if (this.playerGameTime == gameTime) return;
this.playerGameTime = gameTime; this.playerGameTime = gameTime;
// Trigger the script event for game time update.
var questManager = this.getQuestManager();
questManager.queueEvent(QuestCond.QUEST_COND_IS_DAYTIME);
questManager.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ);
questManager.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY);
this.save(); this.save();
} }

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerSkipPlayerGameTimeReq.java
View File

@ -14,7 +14,9 @@ public class HandlerSkipPlayerGameTimeReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
var req = SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.parseFrom(payload); var req = SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.parseFrom(payload);
var player = session.getPlayer(); var player = session.getPlayer();
player.updatePlayerGameTime(req.getGameTime());
var newTime = req.getGameTime() * 1000L;
player.updatePlayerGameTime(newTime);
player.getScene().broadcastPacket(new PacketPlayerGameTimeNotify(player)); player.getScene().broadcastPacket(new PacketPlayerGameTimeNotify(player));
player.sendPacket(new PacketSkipPlayerGameTimeRsp(req)); player.sendPacket(new PacketSkipPlayerGameTimeRsp(req));
} }