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

Swap the if() in the state flag test to make it more readable.

Browse Source
This commit is contained in:
sk89q 2014-08-15 13:54:33 -07:00
parent 8a11752253
commit c0d4ba5c6c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,15 +284,18 @@ private State calculateState(StateFlag flag, @Nullable LocalPlayer player, @Null
}
}
if (regionsThatCountExistHere) {
if (player != null) {
State membership = allowOrNone(needsClear.isEmpty());
return combine(state, membership);
if (player != null) {
State fallback;
if (regionsThatCountExistHere) {
fallback = allowOrNone(needsClear.isEmpty());
} else {
return combine(state, getDefault(flag, null));
fallback = getDefault(flag, player);
}
return combine(state, fallback);
} else {
return combine(getDefault(flag, player));
return combine(state, getDefault(flag, null));
}
}