Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-01 16:20:26 +01:00
Code Issues Projects Releases Wiki Activity

Ensure copy-on-write is used for worldsMap.

Browse Source
This commit is contained in:
asofold 2014-07-26 22:13:53 +02:00
parent 564ce88132
commit 126c400813
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfigManager.java
View File

@ -183,7 +183,7 @@ public class ConfigManager {
*/ */
public static synchronized void init(final Plugin plugin) { public static synchronized void init(final Plugin plugin) {
// (This can lead to minor problems with async checks during reloading.) // (This can lead to minor problems with async checks during reloading.)
worldsMap.clear(); LinkedHashMap<String, ConfigFile> newWorldsMap = new LinkedHashMap<String, ConfigFile>();
// Try to obtain and parse the global configuration file. // Try to obtain and parse the global configuration file.
final File globalFile = new File(plugin.getDataFolder(), "config.yml"); final File globalFile = new File(plugin.getDataFolder(), "config.yml");
PathUtils.processPaths(globalFile, "global config", false); PathUtils.processPaths(globalFile, "global config", false);
@ -224,7 +224,7 @@ public class ConfigManager {
} }
} }
// globalConfig.setActionFactory(); // globalConfig.setActionFactory();
worldsMap.put(null, globalConfig); newWorldsMap.put(null, globalConfig);
final MemoryConfiguration worldDefaults = PathUtils.getWorldsDefaultConfig(globalConfig); final MemoryConfiguration worldDefaults = PathUtils.getWorldsDefaultConfig(globalConfig);
@ -250,7 +250,7 @@ public class ConfigManager {
worldConfig.options().copyDefaults(true); worldConfig.options().copyDefaults(true);
try { try {
worldConfig.load(worldFile); worldConfig.load(worldFile);
worldsMap.put(worldEntry.getKey(), worldConfig); newWorldsMap.put(worldEntry.getKey(), worldConfig);
try{ try{
if (worldConfig.getBoolean(ConfPaths.SAVEBACKCONFIG)) worldConfig.save(worldFile); if (worldConfig.getBoolean(ConfPaths.SAVEBACKCONFIG)) worldConfig.save(worldFile);
} catch (final Exception e){ } catch (final Exception e){
@ -265,17 +265,20 @@ public class ConfigManager {
worldConfig.options().copyDefaults(true); worldConfig.options().copyDefaults(true);
// worldConfig.setActionFactory(); // worldConfig.setActionFactory();
} }
ConfigManager.worldsMap = newWorldsMap;
} }
/** /**
* Set a property in all configs. Might use with DataManager.clearConfigs if configs might already be in use. * Set a property for all configurations. Might use with DataManager.clearConfigs if check-configurations might already be in use.
* @param path * @param path
* @param value * @param value
*/ */
public static void setForAllConfigs(String path, Object value){ public static synchronized void setForAllConfigs(String path, Object value){
for (final ConfigFile cfg : worldsMap.values()){ final Map<String, ConfigFile> newWorldsMap = new LinkedHashMap<String, ConfigFile>(ConfigManager.worldsMap);
for (final ConfigFile cfg : newWorldsMap.values()){
cfg.set(path, value); cfg.set(path, value);
} }
ConfigManager.worldsMap = newWorldsMap;
} }
/** /**