Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #8235 / Fixed #8221

Browse Source
This commit is contained in:
Anuken
2023-02-01 14:42:50 -05:00
parent 411399e96f
commit c2262cc9cf
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/mindustry/net/Administration.java
View File

@@ -24,6 +24,8 @@ public class Administration{
public ObjectSet<String> dosBlacklist = new ObjectSet<>();
public ObjectMap<String, Long> kickedIPs = new ObjectMap<>();
private boolean modified, loaded;
/** All player info. Maps UUIDs to info. This persists throughout restarts. Do not access directly. */
private ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
@@ -448,15 +450,23 @@ public class Administration{
}
public void save(){
Core.settings.putJson("player-data", playerInfo);
Core.settings.putJson("ip-kicks", kickedIPs);
Core.settings.putJson("ip-bans", String.class, bannedIPs);
Core.settings.putJson("whitelist-ids", String.class, whitelist);
Core.settings.putJson("banned-subnets", String.class, subnetBans);
modified = true;
}
public void forceSave(){
if(modified && loaded){
Core.settings.putJson("player-data", playerInfo);
Core.settings.putJson("ip-kicks", kickedIPs);
Core.settings.putJson("ip-bans", String.class, bannedIPs);
Core.settings.putJson("whitelist-ids", String.class, whitelist);
Core.settings.putJson("banned-subnets", String.class, subnetBans);
modified = false;
}
}
@SuppressWarnings("unchecked")
private void load(){
loaded = true;
//load default data
playerInfo = Core.settings.getJson("player-data", ObjectMap.class, ObjectMap::new);
kickedIPs = Core.settings.getJson("ip-kicks", ObjectMap.class, ObjectMap::new);