Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-07-23 03:34:44 +02:00
Code Issues Projects Releases Wiki Activity

fixed /region info and region flag fallback

Browse Source
This commit is contained in:
Redecouverte 2011-02-28 18:36:19 +01:00
parent 19cfd9edc6
commit a8b54757e9
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sk89q/worldguard/bukkit/commands/CommandRegionInfo.java
View File

@ -81,7 +81,7 @@ public boolean handle(CommandSender sender, String senderName, String command, S
s.append(", ");
}
s.append(flags.getFlag(nfo.type).toString());
s.append(nfo.name + ": " + flags.getFlag(nfo.type).toString());
}
sender.sendMessage(ChatColor.BLUE + "Flags: " + s.toString());

25
src/com/sk89q/worldguard/protection/ApplicableRegionSet.java
View File

@ -73,20 +73,29 @@ public boolean isStateFlagAllowed(FlagType type) {
return isStateFlagAllowed(type, global.getDefaultValue(type));
}
public boolean isStateFlagAllowed(FlagType type, LocalPlayer player) {
return isStateFlagAllowed(type, global.getDefaultValue(type)) || this.isMember(player);
}
public boolean isStateFlagAllowed(FlagType type, boolean def) {
State defState = def ? State.ALLOW : State.DENY;
return getStateFlag(type, true).getValue(defState) == State.ALLOW;
if(!this.isAnyRegionAffected())
{
return def;
}
return getStateFlag(type, true).getValue(State.DENY) == State.ALLOW;
}
public boolean isStateFlagAllowed(FlagType type, LocalPlayer player) {
return isStateFlagAllowed(type, global.getDefaultValue(type), player);
}
public boolean isStateFlagAllowed(FlagType type, boolean def, LocalPlayer player) {
State defState = def ? State.ALLOW : State.DENY;
return getStateFlag(type, true).getValue(defState) == State.ALLOW || this.isMember(player);
if(!this.isAnyRegionAffected())
{
return def;
}
return getStateFlag(type, true).getValue(State.DENY) == State.ALLOW || this.isMember(player);
}