From 9be0d2ec2d3eea388d468c1e20d53cd4556d08e1 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Tue, 4 Oct 2022 20:38:18 +0900
Subject: [PATCH] =?UTF-8?q?refac:=20storeOldGeneral=EC=9D=84=20General::ki?=
 =?UTF-8?q?ll=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/General.php             | 2 ++
 hwe/sammo/TurnExecutionHelper.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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;
             }