From 27be6c31e6fee0630ab8b5c9d413dfe6a2249e44 Mon Sep 17 00:00:00 2001
From: Nazrin <lewasite@yahoo.com>
Date: Thu, 1 Jun 2023 09:30:19 -0700
Subject: [PATCH] Fix a typo I left in Player.java (#2180)

ENTER_REGION_ ->LEAVE_REGION_
Took the opportunity to refactor it so that we only calculate the string once.
---
 .../emu/grasscutter/game/player/Player.java    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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..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);
                 }
             }
         });