diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php index 1310e8e4..a355f826 100644 --- a/webapp/services/TameBattleDataService.php +++ b/webapp/services/TameBattleDataService.php @@ -586,7 +586,10 @@ class TameBattleDataService extends BaseService { } } $circuitMeta = mt\CircuitTime::getCurrentCircuit(); - $circuitScore = Circuit::getMyScore($circuitMeta['circuit_season']); + $circuitScore= 0; + if ($circuitMeta){ + $circuitScore = Circuit::getMyScore($circuitMeta['circuit_season']); + } $data = array( "battle_uuid" => $battleUuid, "map_mode_id" => getXVal($this->allInfo,'map_mode_id', 0), @@ -668,7 +671,10 @@ class TameBattleDataService extends BaseService { } } $circuitMeta = mt\CircuitTime::getCurrentCircuit(); - $circuitScore = Circuit::getMyScore($circuitMeta['circuit_season']); + $circuitScore= 0; + if ($circuitMeta){ + $circuitScore = Circuit::getMyScore($circuitMeta['circuit_season']); + } $data = array( 'version'=> getXVal($this->allInfo,'version', 0), 'team_id'=> getXVal($this->allInfo,'team_id', 0), @@ -783,6 +789,7 @@ class TameBattleDataService extends BaseService { 'reward' => $rewards, 'winningPro' => $winningPro, 'match_room_uuid' => getXVal($info,'match_room_uuid', 0), + 'battle_items' => getXVal($info,'battle_items', array()), ); array_push($data['members'],$temp); }