Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-06-29 07:55:05 +02:00
Code Issues Projects Releases Wiki Activity

Added the ability to add owners/members to the global region for handling guest groups.

Browse Source
This commit is contained in:
sk89q 2011-06-27 10:11:23 -07:00
parent 3b871b9c00
commit 360a655627
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java
View File

@ -164,7 +164,13 @@ private boolean internalGetState(StateFlag flag, LocalPlayer player,
// The global region has this flag set
if (globalState != null) {
def = (globalState == State.ALLOW);
// Special case for the build flag
if (player != null && globalRegion.hasMembersOrOwners()) {
def = globalRegion.isMember(player)
? (globalState == State.ALLOW) : false;
} else {
def = (globalState == State.ALLOW);
}
}
}

46
src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java
View File

@ -168,7 +168,6 @@ public void setOwners(DefaultDomain owners) {
* @return the members
*/
public DefaultDomain getMembers() {
return members;
}
@ -178,12 +177,21 @@ public DefaultDomain getMembers() {
public void setMembers(DefaultDomain members) {
this.members = members;
}
/**
* Checks whether a region has members or owners.
*
* @return whether there are members or owners
*/
public boolean hasMembersOrOwners() {
return owners.size() > 0 || members.size() > 0;
}
/**
* Checks whether a player is an owner of region or any of its parents.
*
* @param player
* @return
* @param player player to check
* @return whether an owner
*/
public boolean isOwner(LocalPlayer player) {
if (owners.contains(player)) {
@ -202,12 +210,12 @@ public boolean isOwner(LocalPlayer player) {
return false;
}
/**
* Checks whether a player is a member of the region or any of its parents.
* Checks whether a player is a member OR OWNER of the region
* or any of its parents.
*
* @param player
* @return
* @param player player to check
* @return whether an owner or member
*/
public boolean isMember(LocalPlayer player) {
if (owners.contains(player) || members.contains(player)) {
@ -226,6 +234,30 @@ public boolean isMember(LocalPlayer player) {
return false;
}
/**
* Checks whether a player is a member of the region
* or any of its parents.
*
* @param player player to check
* @return whether an member
*/
public boolean isMemberOnly(LocalPlayer player) {
if (members.contains(player)) {
return true;
}
ProtectedRegion curParent = getParent();
while (curParent != null) {
if (curParent.getMembers().contains(player)) {
return true;
}
curParent = curParent.getParent();
}
return false;
}
/**
* Get a flag's value.