Potentially fix issues with regions

Grasscutters · Jun 1, 2023 · 84e3823 · 84e3823
1 parent 083e9ba
commit 84e3823
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -710,12 +710,9 @@ public void onEnterRegion(SceneRegion region) {
         this.getQuestManager().forEachActiveQuest(quest -> {
             if (quest.getTriggerData() != null &&
                 quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id)) {
-                // If trigger hasn't been fired yet
-                if (!Boolean.TRUE.equals(quest.getTriggers().put("ENTER_REGION_" + region.config_id, true))) {
-                    this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
-                    this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
-                        quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0);
-                }
+                this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
+                this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
+                    quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getId(), 0);
             }
         });
 
@@ -724,12 +721,9 @@ public void onEnterRegion(SceneRegion region) {
     public void onLeaveRegion(SceneRegion region) {
         this.getQuestManager().forEachActiveQuest(quest -> {
             if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id)) {
-                // If trigger hasn't been fired yet
-                if (!Boolean.TRUE.equals(quest.getTriggers().put("LEAVE_REGION_" + region.config_id, true))) {
-                    this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
-                    this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
-                        quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0);
-                }
+                this.getSession().send(new PacketServerCondMeetQuestListUpdateNotify());
+                this.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_TRIGGER_FIRE,
+                    quest.getTriggerData().get("LEAVE_REGION_" + region.config_id).getId(), 0);
             }
         });
     }