From 031f3bcd25ab1d71e3903031fee251072d6eff87 Mon Sep 17 00:00:00 2001
From: Magix <27646710+KingRainbow44@users.noreply.github.com>
Date: Wed, 31 May 2023 22:54:47 -0700
Subject: [PATCH] Revert "Fix issues with regions (#2177)" (#2178)

This reverts commit 50db3a20f563dc11711c5d749870cd2d88d14716.
---
 src/main/java/emu/grasscutter/game/player/Player.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index bda5a2f1d..df03e8d65 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -709,8 +709,7 @@ public class Player implements PlayerHook, FieldFetch {
     public void onEnterRegion(SceneRegion region) {
         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("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());
@@ -724,8 +723,7 @@ public class Player implements PlayerHook, FieldFetch {
 
     public void onLeaveRegion(SceneRegion region) {
         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("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());