Merge pull request #6963 from StabbyCutyou/trigger_area_zoning_logic_…

…updates Relocate triggerarea zoning check
LandSandBoat · Feb 6, 2025 · c096b9c · c096b9c
2 parents aadc6f4 + c714e87
commit c096b9c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/map/lua/luautils.cpp b/src/map/lua/luautils.cpp
@@ -2001,12 +2001,6 @@ namespace luautils
     {
         TracyZoneScoped;
 
-        // Do not enter trigger areas while loading in. Set in xi.player.onGameIn
-        if (PChar->GetLocalVar("ZoningIn") > 0)
-        {
-            return;
-        }
-
         std::string                 filename;
         std::optional<CLuaInstance> optInstance = std::nullopt;
         if (PChar->PInstance)

diff --git a/src/map/zone.cpp b/src/map/zone.cpp
@@ -1224,6 +1224,12 @@ void CZone::CheckTriggerAreas()
         // TODO: When we start to use octrees or spatial hashing to split up zones,
         //     : use them here to make the search domain smaller.
 
+        // Do not enter trigger areas while loading in. Set in xi.player.onGameIn
+        if (PChar->GetLocalVar("ZoningIn") > 0)
+        {
+            return;
+        }
+
         for (const auto& triggerArea : m_triggerAreaList)
         {
             const auto triggerAreaID = triggerArea->getTriggerAreaID();

diff --git a/src/map/zone_instance.cpp b/src/map/zone_instance.cpp
@@ -423,6 +423,12 @@ void CZoneInstance::CheckTriggerAreas()
             // TODO: When we start to use octrees or spatial hashing to split up zones,
             //     : use them here to make the search domain smaller.
 
+            // Do not enter trigger areas while loading in. Set in xi.player.onGameIn
+            if (PChar->GetLocalVar("ZoningIn") > 0)
+            {
+                return;
+            }
+
             for (const auto& triggerArea : m_triggerAreaList)
             {
                 const auto triggerAreaID = triggerArea->getTriggerAreaID();