Merge pull request #10024 from Frankie-hz/superlink

[cpp] Fixes linking issue for battlefield framework with superLinkGroup

Author: Xaver-DaRed

scripts/battlefields/Sacrificial_Chamber/temple_of_uggalepih.lua

@@ -47,6 +47,8 @@ content.groups =
             },
         },
 
+        superlink = true,
+
         allDeath = function(battlefield, mob)
             battlefield:setStatus(xi.battlefield.status.WON)
         end,

src/map/lua/lua_battlefield.cpp

@@ -368,6 +368,7 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas
     // The entities to be added to the battlefield
     std::set<uint32> entities;
     std::set<uint32> spawnedEntities;
+    std::set<uint32> explicitPartyEntities;
 
     std::vector<BattlefieldGroup> battlefieldGroups;
     for (const auto& entry : groups)
@@ -490,6 +491,8 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas
                 {
                     party->AddMember(PMob);
                 }
+
+                explicitPartyEntities.insert(entity->id);
             }
         }
 
@@ -586,7 +589,8 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas
 
                 for (const auto& modifier : mobMods.get<sol::table>())
                 {
-                    PMob->setMobMod(modifier.first.as<uint16>(), modifier.second.as<uint16>());
+                    const auto mobMod = modifier.first.as<uint16>();
+                    PMob->setMobMod(mobMod, modifier.second.as<uint16>());
                 }
                 PMob->saveMobModifiers();
             }
@@ -680,6 +684,37 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas
         m_PLuaBattlefield->addGroup(group);
     }
 
+    // Rebuild party links after all the battlefield groups have their modifiers applied
+    // This avoids ordering bugs when SUPERLINK/SUBLINK or other link-affecting state
+    // are assigned after the zone-load party pass.
+    for (uint32 entityID : entities)
+    {
+        if (explicitPartyEntities.find(entityID) != explicitPartyEntities.end())
+        {
+            continue;
+        }
+
+        auto* PMob = dynamic_cast<CMobEntity*>(zoneutils::GetEntity(entityID, TYPE_MOB));
+        if (PMob != nullptr && PMob->PParty != nullptr)
+        {
+            PMob->PParty->RemoveMember(PMob);
+        }
+    }
+
+    for (uint32 entityID : entities)
+    {
+        if (explicitPartyEntities.find(entityID) != explicitPartyEntities.end())
+        {
+            continue;
+        }
+
+        CBaseEntity* entity = zoneutils::GetEntity(entityID, TYPE_MOB);
+        if (entity != nullptr)
+        {
+            m_PLuaBattlefield->GetZone()->FindPartyForMob(entity);
+        }
+    }
+
     if (m_PLuaBattlefield->GetArmouryCrate() != 0)
     {
         if (auto* entity = dynamic_cast<CNpcEntity*>(zoneutils::GetEntity(m_PLuaBattlefield->GetArmouryCrate(), TYPE_NPC)))

src/map/zone_entities.cpp

@@ -378,8 +378,8 @@ void CZoneEntities::FindPartyForMob(CBaseEntity* PEntity)
             }
 
             // Determine if these mobs should be in the same party.
-            // Force-link mobs with SUPERLINK only group with mobs sharing the same
-            // SUPERLINK value (used by BCNMs/Dynamis to link all mobs in an instance).
+            // Check SUPERLINK first in cases that forceLink is enables with SUPERLINK. (Like BCNMs/Dynamis)
+            // If no SUPERLINK then check if forceLink is enabled and the mob should force link.
             // Otherwise, mobs link by family or sublink as normal.
             bool  match     = false;
             int16 superlink = PMob->getMobMod(MOBMOD_SUPERLINK);
@@ -389,9 +389,7 @@ void CZoneEntities::FindPartyForMob(CBaseEntity* PEntity)
             }
             else if (forceLink)
             {
-                match = PCurrentMob->ShouldForceLink() &&
-                        ((PCurrentMob->m_Link && PCurrentMob->m_SuperFamily == PMob->m_SuperFamily) ||
-                         (sublink && sublink == PCurrentMob->getMobMod(MOBMOD_SUBLINK)));
+                match = PCurrentMob->ShouldForceLink();
             }
             else
             {