1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00

fix PermissionManager error...

Signed-off-by: j502647092 <jtb1@163.com>
This commit is contained in:
j502647092
2015-09-24 23:42:28 +08:00
parent 75f7cb4be8
commit 2efa4a4248
9 changed files with 125 additions and 197 deletions

View File

@@ -27,6 +27,13 @@ import com.bekvon.bukkit.residence.Residence;
*/
public class FlagPermissions {
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>();
@@ -36,10 +43,10 @@ public class FlagPermissions {
protected Map<String, Boolean> cuboidFlags;
protected Map<String, Map<String, Boolean>> groupFlags;
protected FlagPermissions parent;
protected Map<String, Map<String, Boolean>> playerFlags;
public FlagPermissions(final Residence plugin) {
FlagPermissions.plugin = plugin;
public FlagPermissions() {
cuboidFlags = Collections.synchronizedMap(new HashMap<String, Boolean>());
playerFlags = Collections.synchronizedMap(new HashMap<String, Map<String, Boolean>>());
groupFlags = Collections.synchronizedMap(new HashMap<String, Map<String, Boolean>>());
@@ -97,7 +104,8 @@ public class FlagPermissions {
return (EnumMap<Material, String>) matUseFlagList;
}
public static void initValidFlags() {
public static void initValidFlags(final Residence plugin) {
FlagPermissions.plugin = plugin;
validAreaFlags.clear();
validPlayerFlags.clear();
validFlags.clear();
@@ -225,12 +233,12 @@ public class FlagPermissions {
}
public static FlagPermissions load(final Map<String, Object> root) throws Exception {
final FlagPermissions newperms = new FlagPermissions(plugin);
final FlagPermissions newperms = new FlagPermissions();
return FlagPermissions.load(root, newperms);
}
public static FlagPermissions parseFromConfigNode(final String name, final ConfigurationSection node) {
final FlagPermissions list = new FlagPermissions(plugin);
final FlagPermissions list = new FlagPermissions();
final Set<String> keys = node.getConfigurationSection(name).getKeys(false);
if (keys != null) {
for (String key : keys) {
@@ -624,12 +632,4 @@ public class FlagPermissions {
}
return def;
}
public static enum FlagState {
FALSE,
INVALID,
NEITHER,
TRUE
}
}