From a25e3025b54d53f9df959f27d23e01139b7e032e Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Fri, 2 Oct 2015 20:14:52 +0800
Subject: [PATCH] fix WorldFlagError...

---
 pom.xml                                       |  6 ++---
 .../bukkit/residence/ResidenceMain.java       |  9 ++++---
 .../residence/protection/FlagPermissions.java | 25 +++++++++++--------
 .../protection/WorldFlagManager.java          |  7 +-----
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ddbe63..23e8b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,8 @@
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
 		<repository>
-			<id>citycraft-repo</id>
-			<url>http://ci.citycraft.cn:8800/jenkins/plugin/repository/everything/</url>
+			<id>sumcraft-repo</id>
+			<url>http://ci.sumcraft.net:8080/plugin/repository/everything/</url>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -66,7 +66,7 @@
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
 			<type>jar</type>
-			<version>1.8.3-R0.1-SNAPSHOT</version>
+			<version>1.8.8-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.earth2me</groupId>
diff --git a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
index c2e2000..5278228 100644
--- a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
+++ b/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
@@ -127,8 +127,10 @@ public class ResidenceMain extends JavaPlugin {
 		return instance;
 	}
 
-	public void csm(final String... msg) {
-		Bukkit.getConsoleSender().sendMessage("§6[§a领地插件§6] " + msg);
+	public void csm(final String... msgs) {
+		for (final String msg : msgs) {
+			Bukkit.getConsoleSender().sendMessage("§6[§a领地插件§6]§r " + msg);
+		}
 	}
 
 	public DataBackup getBackup() {
@@ -364,6 +366,7 @@ public class ResidenceMain extends JavaPlugin {
 	public void onEnable() {
 		try {
 			instance = this;
+			FlagPermissions.init(this);
 			this.getLogger().info("Bukkit 版本: " + this.getServer().getBukkitVersion());
 			bukkitver = Float.parseFloat(this.getServer().getBukkitVersion().substring(0, 3));
 			init = false;
@@ -460,7 +463,7 @@ public class ResidenceMain extends JavaPlugin {
 				if (!this.isEnabled()) {
 					return;
 				}
-				FlagPermissions.initValidFlags(this);
+				FlagPermissions.initValidFlags();
 				final Plugin wep = this.getServer().getPluginManager().getPlugin("WorldEdit");
 				if (wep != null) {
 					smanager = new WorldEditSelectionManager(this);
diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
index e6a5123..861197d 100644
--- a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
+++ b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
@@ -27,16 +27,23 @@ import com.bekvon.bukkit.residence.ResidenceMain;
  */
 public class FlagPermissions {
 
-	protected static ArrayList<String> validAreaFlags = new ArrayList<String>();
+	public static enum FlagState {
+		FALSE,
+		INVALID,
+		NEITHER,
+		TRUE
+	}
 
+	protected static ArrayList<String> validAreaFlags = new ArrayList<String>();
 	protected static HashMap<String, ArrayList<String>> validFlagGroups = new HashMap<String, ArrayList<String>>();
 	protected static ArrayList<String> validFlags = new ArrayList<String>();
 	protected static ArrayList<String> validPlayerFlags = new ArrayList<String>();
 	final static Map<Material, String> matUseFlagList = new EnumMap<Material, String>(Material.class);
-	static ResidenceMain plugin;
+	protected static ResidenceMain plugin;
 	protected Map<String, Boolean> cuboidFlags;
 	protected Map<String, Map<String, Boolean>> groupFlags;
 	protected FlagPermissions parent;
+
 	protected Map<String, Map<String, Boolean>> playerFlags;
 
 	public FlagPermissions() {
@@ -97,8 +104,11 @@ public class FlagPermissions {
 		return (EnumMap<Material, String>) matUseFlagList;
 	}
 
-	public static void initValidFlags(final ResidenceMain plugin) {
-		FlagPermissions.plugin = plugin;
+	public static void init(final ResidenceMain resmain) {
+		plugin = resmain;
+	}
+
+	public static void initValidFlags() {
 		validAreaFlags.clear();
 		validPlayerFlags.clear();
 		validFlags.clear();
@@ -624,11 +634,4 @@ public class FlagPermissions {
 		}
 		return def;
 	}
-
-	public static enum FlagState {
-		FALSE,
-		INVALID,
-		NEITHER,
-		TRUE
-	}
 }
diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java
index dacf04d..a40e9c3 100644
--- a/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java
+++ b/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java
@@ -32,11 +32,7 @@ public class WorldFlagManager {
 		globaldefaults = new FlagPermissions();
 		worldperms = new HashMap<String, FlagPermissions>();
 		groupperms = new HashMap<String, Map<String, FlagPermissions>>();
-	}
-
-	public WorldFlagManager(final ResidenceMain plugin, final FileConfiguration config) {
-		this(plugin);
-		this.parsePerms(config);
+		this.parsePerms(plugin.getConfig());
 	}
 
 	public FlagPermissions getPerms(final Player player) {
@@ -78,7 +74,6 @@ public class WorldFlagManager {
 
 	public void parsePerms(final FileConfiguration config) {
 		try {
-
 			Set<String> keys = config.getConfigurationSection("Global.Flags").getKeys(false);
 			if (keys != null) {
 				for (final String key : keys) {