diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 041f58f1..bdac693a 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -665,6 +665,8 @@ class General implements iAction 'reserved_until' => null, ], 'general_id=%i', $generalID); + storeOldGeneral($generalID, $logger->getYear(), $logger->getMonth()); + $db->delete('general', 'no=%i', $generalID); $db->delete('general_turn', 'general_id=%i', $generalID); $db->delete('rank_data', 'general_id=%i', $generalID); diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php index d334bda3..1c0e700c 100644 --- a/hwe/sammo/TurnExecutionHelper.php +++ b/hwe/sammo/TurnExecutionHelper.php @@ -195,7 +195,6 @@ class TurnExecutionHelper $general->setVar('owner_name', null); } else { $general->applyDB($db); - storeOldGeneral($generalID, $gameStor->year, $gameStor->month); $general->kill($db); return; }