From bd0b20a737a966555539ace43d04b84bad395518 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 27 Dec 2023 11:19:48 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B2=84=ED=94=84=EC=9D=98=20=EB=A7=8C?=
 =?UTF-8?q?=EB=A3=8C=20=EA=B8=B0=EA=B0=84=EC=9D=84=20=EB=8B=A4=EC=9D=8C?=
 =?UTF-8?q?=ED=84=B4=20=EC=A7=81=EC=A0=84=EA=B9=8C=EC=A7=80=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EC=A0=84=ED=88=AC=20=EB=B2=84?=
 =?UTF-8?q?=ED=94=84=20=EB=93=B1=EC=97=90=EC=84=9C=20=EC=9E=A5=EC=88=98=20?=
 =?UTF-8?q?=ED=84=B4=EC=8B=9C=EA=B0=84=EC=97=90=20=EB=94=B0=EB=9D=BC=20?=
 =?UTF-8?q?=ED=9A=A8=EA=B3=BC=EB=B3=B4=EB=8A=94=20=EC=8B=9C=EA=B0=84?=
 =?UTF-8?q?=EC=9D=84=20=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index a33ce880..745e4190 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -137,6 +137,22 @@ class General extends GeneralBase implements iAction
             return;
         }
 
+        foreach($rawBuffList as $rawBuff){
+            $buffItem = InstantBuff::fromArray($rawBuff);
+            $this->instantBuffList[] = buildBuffClass($buffItem->buffName);
+        }
+
+    }
+
+    //기한이 지난 버프를 삭제
+    function clearExpiredBuff()
+    {
+        $this->instantBuffList = [];
+        $rawBuffList = $this->getAuxVar(GeneralAuxKey::instantBuffList);
+        if($rawBuffList === null){
+            return;
+        }
+
         $newRawBuffList = [];
         $reqUpdate = false;
 
diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php
index f75b8c2c..abcc7c2e 100644
--- a/hwe/sammo/TurnExecutionHelper.php
+++ b/hwe/sammo/TurnExecutionHelper.php
@@ -313,6 +313,8 @@ class TurnExecutionHelper
 
             $general->increaseInheritancePoint(InheritanceKey::lived_month, 1);
 
+            $general->clearExpiredBuff();
+
             $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
                 UniqueConst::$hiddenSeed,
                 'preprocess',