Follow master instead of group master in formation

liyunfan1223 · Jan 4, 2025 · 9293e5b · 9293e5b
1 parent a5787a0
commit 9293e5b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/strategy/values/Formations.cpp b/src/strategy/values/Formations.cpp
@@ -23,7 +23,7 @@ bool Formation::IsNullLocation(WorldLocation const& loc) { return IsSameLocation
 
 WorldLocation MoveAheadFormation::GetLocation()
 {
-    Player* master = botAI->GetGroupMaster();
+    Player* master = GetMaster();
     if (!master || master == bot)
         return WorldLocation();
 
@@ -110,7 +110,7 @@ class ChaosFormation : public MoveAheadFormation
 
     WorldLocation GetLocationInternal() override
     {
-        Player* master = botAI->GetGroupMaster();
+        Player* master = GetMaster();
         if (!master)
             return WorldLocation();
 
@@ -120,7 +120,7 @@ class ChaosFormation : public MoveAheadFormation
         time_t now = time(nullptr);
         if (!lastChangeTime || now - lastChangeTime >= 3)
         {
-            Player* master = botAI->GetGroupMaster();
+            Player* master = GetMaster();
             if (!master)
                 return WorldLocation();
 
@@ -185,7 +185,7 @@ class CircleFormation : public MoveFormation
         float range = 2.0f;
 
         Unit* target = AI_VALUE(Unit*, "current target");
-        Player* master = botAI->GetGroupMaster();
+        Player* master = GetMaster();
         if (!target && target != bot)
             target = master;
 
@@ -239,7 +239,7 @@ class LineFormation : public MoveAheadFormation
 
         float range = 2.0f;
 
-        Player* master = botAI->GetGroupMaster();
+        Player* master = GetMaster();
         if (!master)
             return Formation::NullLocation;