diff --git a/pom.xml b/pom.xml
index 9ddbe63..23e8b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,8 @@
https://hub.spigotmc.org/nexus/content/groups/public/
- citycraft-repo
- http://ci.citycraft.cn:8800/jenkins/plugin/repository/everything/
+ sumcraft-repo
+ http://ci.sumcraft.net:8080/plugin/repository/everything/
@@ -66,7 +66,7 @@
org.spigotmc
spigot-api
jar
- 1.8.3-R0.1-SNAPSHOT
+ 1.8.8-R0.1-SNAPSHOT
com.earth2me
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 validAreaFlags = new ArrayList();
+ public static enum FlagState {
+ FALSE,
+ INVALID,
+ NEITHER,
+ TRUE
+ }
+ protected static ArrayList validAreaFlags = new ArrayList();
protected static HashMap> validFlagGroups = new HashMap>();
protected static ArrayList validFlags = new ArrayList();
protected static ArrayList validPlayerFlags = new ArrayList();
final static Map matUseFlagList = new EnumMap(Material.class);
- static ResidenceMain plugin;
+ protected static ResidenceMain plugin;
protected Map cuboidFlags;
protected Map> groupFlags;
protected FlagPermissions parent;
+
protected Map> playerFlags;
public FlagPermissions() {
@@ -97,8 +104,11 @@ public class FlagPermissions {
return (EnumMap) 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();
groupperms = new HashMap>();
- }
-
- 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 keys = config.getConfigurationSection("Global.Flags").getKeys(false);
if (keys != null) {
for (final String key : keys) {