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

Fix NPEs when player leaves world

Browse Source
This commit is contained in:
KingRainbow44 2023-04-29 14:04:26 -04:00
parent 02653620d4
commit 5f4f220eab
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,18 +127,18 @@ public class QuestManager extends BasePlayerManager {
this.player.getActivityManager().triggerActivityConditions(); this.player.getActivityManager().triggerActivityConditions();
} }
public void onTick(){ public void onTick() {
checkTimeVars(); var world = this.getPlayer().getWorld();
if (world == null) return;
checkTimeVars();
// trigger game time tick for quests // trigger game time tick for quests
queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK, queueEvent(QuestContent.QUEST_CONTENT_GAME_TIME_TICK,
player.getWorld().getGameTimeHours() , // hours world.getGameTimeHours() , // hours
0); 0);
} }
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;
@ -385,7 +385,7 @@ public class QuestManager extends BasePlayerManager {
*/ */
public void checkQuestAlreadyFullfilled(GameQuest quest){ public void checkQuestAlreadyFullfilled(GameQuest quest){
Grasscutter.getGameServer().getScheduler().scheduleDelayedTask(() -> { Grasscutter.getGameServer().getScheduler().scheduleDelayedTask(() -> {
for(var condition : quest.getQuestData().getFinishCond()){ for (var condition : quest.getQuestData().getFinishCond()){
switch (condition.getType()) { switch (condition.getType()) {
case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> { case QUEST_CONTENT_OBTAIN_ITEM, QUEST_CONTENT_ITEM_LESS_THAN -> {
//check if we already own enough of the item //check if we already own enough of the item