502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00
Code Releases Activity

fix WorldFlagError...

Browse Source
This commit is contained in:
j502647092
2015-10-02 20:14:52 +08:00
parent 3f6ebcfb79
commit a25e3025b5
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java
View File

@@ -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);

25
src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
View File

@@ -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
}
}

7
src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java
View File

@@ -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) {