merge: validate invader resume watchdog fix

hwe/sammo/TurnExecutionHelper.php

@@ -39,6 +39,18 @@ class TurnExecutionHelper
     {
         return max($completedTick, $candidateTick);
     }
+
+    private static function recordInvaderProgress(KVStorage $gameStorage, int $beforeTick): void
+    {
+        if (Util::toInt($gameStorage->isunited) !== 1) {
+            return;
+        }
+        AutoResetProgress::recordIfAdvanced(
+            $gameStorage,
+            $beforeTick,
+            Util::toInt($gameStorage->turntime),
+        );
+    }
 
     public function __destruct()
     {
@@ -637,6 +649,8 @@ class TurnExecutionHelper
             $locked = true;
             return $gameStor->turntime;
         }
+
+        $completionTickBeforeRun = Util::toInt($gameStor->turntime);
 
         $gameStor->cacheAll();
         // 1턴이상 갱신 없었으면 서버 지연
@@ -683,6 +697,7 @@ class TurnExecutionHelper
                         $currentTurn,
                     );
                 }
+                self::recordInvaderProgress($gameStor, $completionTickBeforeRun);
                 unlock();
                 return $gameStor->turntime;
             }
@@ -768,6 +783,7 @@ class TurnExecutionHelper
         processTournament();
         //거래 처리
         processAuction();
+        self::recordInvaderProgress($gameStor, $completionTickBeforeRun);
         // 잠금 해제
 
         $turntime = $gameStor->turntime;