Merge branch 'develop' into dane/restore-backups

This commit is contained in:
Dane Everitt 2021-01-30 10:10:29 -08:00
commit be26921fcc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 440 additions and 362 deletions

View file

@ -76,8 +76,8 @@ class ServerCreationService
* CreationService constructor.
*
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
* @param \Pterodactyl\Services\Servers\ServerDeletionService $serverDeletionService
* @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService
* @param \Pterodactyl\Services\Servers\ServerDeletionService $serverDeletionService
* @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService
*/
public function __construct(
AllocationSelectionService $allocationSelectionService,
@ -258,7 +258,7 @@ class ServerCreationService
return [
'server_id' => $server->id,
'variable_id' => $result->id,
'variable_value' => $result->value,
'variable_value' => $result->value ?? '',
];
})->toArray();