From bb7d1fc9ab03a542c84fcfe4724c08be56e02813 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 9 Sep 2020 13:48:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=AA=B0=EC=9D=84=20=EC=95=84?=
 =?UTF-8?q?=EB=AC=B4=20=EA=B5=AD=EA=B0=80=EC=97=90=EB=82=98=20=EC=93=B8=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Constraint/BattleGroundCity.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hwe/sammo/Constraint/BattleGroundCity.php b/hwe/sammo/Constraint/BattleGroundCity.php
index a9dc5777..d6af692d 100644
--- a/hwe/sammo/Constraint/BattleGroundCity.php
+++ b/hwe/sammo/Constraint/BattleGroundCity.php
@@ -29,15 +29,11 @@ class BattleGroundCity extends Constraint{
         $this->tested = true;
 
         $nationID = $this->general['nation'];
-        $destNationID = $this->city['nation'];
+        $destNationID = $this->destCity['nation'];
         if($destNationID == 0){
             return true;
         }
 
-        if($this->arg && $destNationID == $nationID){
-            return true;
-        }
-
         $db = DB::db();
         $diplomacy = $db->queryFirstField('SELECT state FROM diplomacy WHERE me = %i AND you = %i', $nationID, $destNationID);
         if($diplomacy == 0){