array_merge 대신 + 기호로 충분한 경우(dictionary) +로 변경함.
This commit is contained in:
1 parent
3d06a13e72
commit
cff76c9db9
7 files changed
+11
-13
No files matched your search
+1
-3
@@ -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);
|
||||
}
|
||||
|
||||
// 분기계산. 장수들 턴보다 먼저 있다면 먼저처리
|
||||
|
||||
Reference in new issue
Block a user