거병 추가

2018-11-06 02:50:25 +09:00
parent 5a56be8a75
commit 944931f7d1
4 changed files with 172 additions and 200 deletions
@@ -84,6 +84,18 @@ abstract class BaseCommand{
            $this->generalObj->setRawCity($this->city);
            return;
        }
+        
+        $this->city = $this->generalObj->getRawCity();
+        $hasArgs = true;
+        foreach($args as $arg){
+            if(!key_exists($arg, $this->city)){
+                $hasArgs = false;
+                break;
+            }
+        }
+        if($hasArgs){
+            return;
+        }
        $this->city = $db->queryFirstRow('SELECT %lb FROM city WHERE city=%i', $args, $this->generalObj->getVar('city'));
        if($this->generalObj->getRawCity() === null){
            $this->generalObj->setRawCity($this->city);