Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 06:24:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix potential NPE

Browse Source 
this can occur if the player disconnects before logging in
This commit is contained in:
KingRainbow44 2023-04-29 01:59:45 -04:00
parent c2e9bdd261
commit 7efa6d1b78
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/game/quest/QuestManager.java
View File

@ -137,6 +137,8 @@ public class QuestManager extends BasePlayerManager {
} }
private void checkTimeVars() { private void checkTimeVars() {
if (this.player.getWorld() == null) return;
val currentDays = player.getWorld().getTotalGameTimeDays(); val currentDays = player.getWorld().getTotalGameTimeDays();
val currentHours = player.getWorld().getTotalGameTimeHours(); val currentHours = player.getWorld().getTotalGameTimeHours();
boolean checkDays = currentDays != lastDayCheck; boolean checkDays = currentDays != lastDayCheck;
@ -150,13 +152,13 @@ public class QuestManager extends BasePlayerManager {
this.lastHourCheck = currentHours; this.lastHourCheck = currentHours;
player.getActiveQuestTimers().forEach(mainQuestId -> { player.getActiveQuestTimers().forEach(mainQuestId -> {
if(checkHours) { if (checkHours) {
queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId); this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_GT_EQ, mainQuestId);
queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId); this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ, mainQuestId);
} }
if(checkDays) { if (checkDays) {
queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId); this.queueEvent(QuestCond.QUEST_COND_TIME_VAR_PASS_DAY, mainQuestId);
queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId); this.queueEvent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY, mainQuestId);
} }
}); });
} }