Fix issues with regions (#2179)

Luckily, SceneRegion and TriggerExcelConfigData both have group numbers, so we can use those to differentiate regions!
Grasscutters · Jun 1, 2023 · 97c70f7 · 97c70f7
1 parent 9e5b57a
commit 97c70f7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -709,7 +709,8 @@ public TowerData getTowerData() {
     public void onEnterRegion(SceneRegion region) {
         this.getQuestManager().forEachActiveQuest(quest -> {
             if (quest.getTriggerData() != null &&
-                quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id)) {
+                quest.getTriggers().containsKey("ENTER_REGION_"+ region.config_id) &&
+                    region.getGroupId() == quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getGroupId()) {
                 // 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());
@@ -723,7 +724,8 @@ public void onEnterRegion(SceneRegion region) {
 
     public void onLeaveRegion(SceneRegion region) {
         this.getQuestManager().forEachActiveQuest(quest -> {
-            if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id)) {
+            if (quest.getTriggers().containsKey("LEAVE_REGION_" + region.config_id) &&
+                region.getGroupId() == quest.getTriggerData().get("ENTER_REGION_" + region.config_id).getGroupId()) {
                 // 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());