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

Add test coverage for startup modification

Browse source
This commit is contained in:
Dane Everitt 2020-10-08 20:38:21 -07:00
parent d087bebc93
commit 7a643beee0
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 148 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/Services/Servers/StartupModificationService.php
View file

@ -89,22 +89,21 @@ class StartupModificationService
*/
protected function updateAdministrativeSettings(array $data, Server &$server)
{
if (
is_digit(Arr::get($data, 'egg_id'))
&& $data['egg_id'] != $server->egg_id
&& is_null(Arr::get($data, 'nest_id'))
) {
/** @var \Pterodactyl\Models\Egg $egg */
$egg = Egg::query()->select(['nest_id'])->findOrFail($data['egg_id']);
$eggId = Arr::get($data, 'egg_id');
$data['nest_id'] = $egg->nest_id;
if (is_digit($eggId) && $server->egg_id !== (int)$eggId) {
/** @var \Pterodactyl\Models\Egg $egg */
$egg = Egg::query()->findOrFail($data['egg_id']);
$server = $server->forceFill([
'egg_id' => $egg->id,
'nest_id' => $egg->nest_id,
]);
}
$server->forceFill([
'installed' => 0,
'startup' => $data['startup'] ?? $server->startup,
'nest_id' => $data['nest_id'] ?? $server->nest_id,
'egg_id' => $data['egg_id'] ?? $server->egg_id,
'skip_scripts' => $data['skip_scripts'] ?? isset($data['skip_scripts']),
'image' => $data['docker_image'] ?? $server->image,
])->save();