diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java index bda5a2f1d..c2ffa060a 100644 --- a/src/main/java/emu/grasscutter/game/player/Player.java +++ b/src/main/java/emu/grasscutter/game/player/Player.java @@ -707,15 +707,16 @@ public class Player implements PlayerHook, FieldFetch { } public void onEnterRegion(SceneRegion region) { + var enterRegionName = "ENTER_REGION_" + region.config_id; this.getQuestManager().forEachActiveQuest(quest -> { if (quest.getTriggerData() != null && - quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id) && - region.getGroupId() == quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getGroupId()) { + quest.getTriggers().containsKey(enterRegionName) && + region.getGroupId() == quest.getTriggerData().get(enterRegionName).getGroupId()) { // If trigger hasn't been fired yet - if (!Boolean.TRUE.equals(quest.getTriggers().put("ENTER_REGION_" + region.config_id, true))) { + if (!Boolean.TRUE.equals(quest.getTriggers().put(enterRegionName, true))) { this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify()); this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE, - quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0); + quest.getTriggerData().get(enterRegionName).getId(), 0); } } }); @@ -723,14 +724,15 @@ public class Player implements PlayerHook, FieldFetch { } public void onLeaveRegion(SceneRegion region) { + var leaveRegionName = "LEAVE_REGION_" + region.config_id; this.getQuestManager().forEachActiveQuest(quest -> { - if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id) && - region.getGroupId() == quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getGroupId()) { + if (quest.getTriggers().containsKey(leaveRegionName) && + region.getGroupId() == quest.getTriggerData().get(leaveRegionName).getGroupId()) { // If trigger hasn't been fired yet - if (!Boolean.TRUE.equals(quest.getTriggers().put("LEAVE_REGION_" + region.config_id, true))) { + if (!Boolean.TRUE.equals(quest.getTriggers().put(leaveRegionName, true))) { this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify()); this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE, - quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0); + quest.getTriggerData().get(leaveRegionName).getId(), 0); } } });