summaryrefslogtreecommitdiffstats
path: root/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
diff options
context:
space:
mode:
Diffstat (limited to 'EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java')
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java44
1 files changed, 15 insertions, 29 deletions
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
index fce56906d..49cf15647 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
@@ -19,43 +19,29 @@ public class SignsConfigHolder extends AsyncStorageObjectHolder<SignsConfig>
super(ess, SignsConfig.class);
this.plugin = plugin;
onReload();
- acquireReadLock();
- try
+ final Map<String, Boolean> signs = getData().getSigns();
+ for (Map.Entry<String, Boolean> entry : signs.entrySet())
{
- final Map<String, Boolean> signs = getData().getSigns();
- for (Map.Entry<String, Boolean> entry : signs.entrySet())
+ if (entry.getKey().trim().toUpperCase(Locale.ENGLISH).equals("COLOR") || entry.getKey().trim().toUpperCase(Locale.ENGLISH).equals("COLOUR"))
{
- if (entry.getKey().trim().toUpperCase(Locale.ENGLISH).equals("COLOR") || entry.getKey().trim().toUpperCase(Locale.ENGLISH).equals("COLOUR"))
- {
- signsEnabled = true;
- continue;
- }
- final Signs sign = Signs.valueOf(entry.getKey().toUpperCase(Locale.ENGLISH));
- if (sign != null && entry.getValue())
- {
- enabledSigns.add(sign.getSign());
- signsEnabled = true;
- }
+ signsEnabled = true;
+ continue;
}
- }
- finally
- {
- unlock();
- }
- acquireWriteLock();
- try
- {
- final Map<String, Boolean> signs = new HashMap<String, Boolean>();
- for (Signs sign : Signs.values())
+ final Signs sign = Signs.valueOf(entry.getKey().toUpperCase(Locale.ENGLISH));
+ if (sign != null && entry.getValue())
{
- signs.put(sign.toString(), enabledSigns.contains(sign.getSign()));
+ enabledSigns.add(sign.getSign());
+ signsEnabled = true;
}
- getData().setSigns(signs);
}
- finally
+
+ final Map<String, Boolean> signs2 = new HashMap<String, Boolean>();
+ for (Signs sign : Signs.values())
{
- unlock();
+ signs2.put(sign.toString(), enabledSigns.contains(sign.getSign()));
}
+ getData().setSigns(signs2);
+ queueSave();
}
@Override