array_merge 대신 + 기호로 충분한 경우(dictionary) +로 변경함.

2018-04-07 18:30:23 +09:00
parent 3d06a13e72
commit cff76c9db9
7 changed files with 11 additions and 13 deletions
@@ -1613,9 +1613,7 @@ function checkTurn() {
            $action = Json::decode($rawEvent['action']);
            $event = new Event\EventHandler($cond, $action);

-            $event->tryRunEvent(array_merge([
-                'currentEventID'=>$eventID
-            ], $admin));
+            $event->tryRunEvent(['currentEventID'=>$eventID] + $admin);
        }

        // 분기계산. 장수들 턴보다 먼저 있다면 먼저처리