MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly set the server state on install; closes pterodactyl/panel#2236

Browse Source
This commit is contained in:
Dane Everitt
2020-08-19 19:08:15 -07:00
parent 4d3a860604
commit 9d2321f357
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/loader.go
View File

@@ -79,12 +79,15 @@ func LoadDirectory() error {
func FromConfiguration(data *api.ServerConfigurationResponse) (*Server, error) {
cfg := Configuration{}
if err := defaults.Set(&cfg); err != nil {
return nil, err
return nil, errors.WithMessage(err, "failed to set struct defaults for server configuration")
}
s := new(Server)
s.cfg = cfg
if err := defaults.Set(s); err != nil {
return nil, errors.WithMessage(err, "failed to set struct defaults for server")
}
s.cfg = cfg
if err := s.UpdateDataStructure(data.Settings, false); err != nil {
return nil, err
}