Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-23 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix potential NPE in FlagValueCalculator.

Browse Source
This commit is contained in:
sk89q 2014-08-22 19:17:46 -07:00
parent 0edb948a40
commit 54237c0038
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,7 +443,9 @@ public <V> V getEffectiveFlag(final ProtectedRegion region, Flag<V> flag, @Nulla
group = flag.getRegionGroupFlag().getDefault(); group = flag.getRegionGroupFlag().getDefault();
} }
if (subject == null) { if (group == null) {
use = false;
} else if (subject == null) {
use = group.contains(Association.NON_MEMBER); use = group.contains(Association.NON_MEMBER);
} else if (!group.contains(subject.getAssociation(region))) { } else if (!group.contains(subject.getAssociation(region))) {
use = false; use = false;