StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/PTDL-472

Browse source
This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Repositories/Old/old_ServerRepository.php
View file

@ -535,7 +535,7 @@ class old_ServerRepository
}
$newPorts = true;
$firstNewAllocation = (is_null($firstNewAllocation)) ? $model->id : $firstNewAllocation;
$firstNewAllocation = $firstNewAllocation ?? $model;
$model->update([
'server_id' => $server->id,
]);
@ -555,7 +555,8 @@ class old_ServerRepository
}
// New Allocation, set as the default.
$server->allocation_id = $firstNewAllocation;
$server->allocation_id = $firstNewAllocation->id;
$newBuild['default'] = ['ip' => $firstNewAllocation->ip, 'port' => $firstNewAllocation->port];
}
$newPorts = true;