Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-07-09 12:54:58 +02:00
Code Issues Projects Releases Wiki Activity

Don't check region group if the flag value is null.

Browse Source
This commit is contained in:
sk89q 2014-08-18 02:32:05 -07:00
parent 0f10e89f7c
commit 095f2aa67e
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java
View File

@ -390,25 +390,28 @@ public <V> V getEffectiveFlag(final ProtectedRegion region, Flag<V> flag, @Nulla
while (current != null) {
V value = current.getFlag(flag);
boolean use = true;
if (flag.getRegionGroupFlag() != null) {
RegionGroup group = current.getFlag(flag.getRegionGroupFlag());
if (group == null) {
group = flag.getRegionGroupFlag().getDefault();
if (value != null) {
boolean use = true;
if (flag.getRegionGroupFlag() != null) {
RegionGroup group = current.getFlag(flag.getRegionGroupFlag());
if (group == null) {
group = flag.getRegionGroupFlag().getDefault();
}
if (subject == null) {
use = group.contains(Association.NON_MEMBER);
} else if (!group.contains(subject.getAssociation(region))) {
use = false;
}
}
if (subject == null) {
use = group.contains(Association.NON_MEMBER);
} else if (!group.contains(subject.getAssociation(region))) {
use = false;
if (use) {
return value;
}
}
if (use && value != null) {
return value;
}
current = current.getParent();
}