virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 1.21.5

Browse source 
# Conflicts:
#	gradle.properties
This commit is contained in:
Oth3r 2025-07-19 20:58:07 -05:00
commit 9f79a99044
Failed to generate hash of commit
5 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/one/oth3r/sit/file/ServerConfig.java
View file

@ -345,6 +345,11 @@ public class ServerConfig implements CustomFile<ServerConfig> {
} catch (Exception e) {
Data.LOGGER.error("Failed to delete the old Sit! config.");
}
// save the updated configs
FileData.saveFiles();
// continue loading as normal...
}
/**
@ -494,8 +499,6 @@ public class ServerConfig implements CustomFile<ServerConfig> {
FileData.setServerConfig(serverConfig);
FileData.setSittingConfig(sittingConfig);
serverConfig.save();
sittingConfig.save();
} catch (Exception e) {
Data.LOGGER.error("Error loading legacy config: %s", e.getMessage());
}