From a59efb80f92168541b34fa96006807c1cccaec30 Mon Sep 17 00:00:00 2001 From: asofold Date: Sun, 24 Jun 2012 03:22:56 +0200 Subject: [PATCH] Preserve order of entries in the lists read from the configuration. --- CompatNoCheatPlus/cncp_lists.txt | 4 ++++ .../src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java | 4 ++-- .../src/me/asofold/bukkit/cncp/setttings/Settings.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CompatNoCheatPlus/cncp_lists.txt b/CompatNoCheatPlus/cncp_lists.txt index d02e9e1..032f32e 100644 --- a/CompatNoCheatPlus/cncp_lists.txt +++ b/CompatNoCheatPlus/cncp_lists.txt @@ -20,4 +20,8 @@ STACK VERSION HISTORY --------------------------- +(0.1.0) +- (add) List to enable plugins: plugins.ensure-enable [Forces their events to be processed before NoCheatPlus gets them!] +- (bugfix) Preserve order of entries in the lists read from the configuration. + (0.0.0) [initial version] diff --git a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java index 8e3db5e..ad12fb7 100644 --- a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java +++ b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java @@ -3,7 +3,7 @@ package me.asofold.bukkit.cncp; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.logging.Logger; @@ -168,7 +168,7 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener { } public boolean reloadSettings() { - final Set oldForceEnableLater = new HashSet(); + final Set oldForceEnableLater = new LinkedHashSet(); oldForceEnableLater.addAll(settings.forceEnableLater); // Read and apply config to settings: File file = new File(getDataFolder() , "cncp.yml"); diff --git a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/setttings/Settings.java b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/setttings/Settings.java index 7a690d2..d0e1daf 100644 --- a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/setttings/Settings.java +++ b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/setttings/Settings.java @@ -1,7 +1,7 @@ package me.asofold.bukkit.cncp.setttings; import java.util.Arrays; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import me.asofold.bukkit.cncp.config.compatlayer.CompatConfig; @@ -9,8 +9,8 @@ import me.asofold.bukkit.cncp.config.compatlayer.ConfigUtil; import me.asofold.bukkit.cncp.config.compatlayer.NewConfig; public class Settings { - public Set forceEnableLater = new HashSet(); - public Set loadPlugins = new HashSet(); + public Set forceEnableLater = new LinkedHashSet(); + public Set loadPlugins = new LinkedHashSet(); public static CompatConfig getDefaultConfig(){ CompatConfig cfg = new NewConfig(null);