Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-04 17:47:41 +02:00
Code Issues Projects Releases Wiki Activity

Allow __global__ BUILD to be set to DENY.

Browse Source
This commit is contained in:
sk89q 2014-08-16 13:55:54 -07:00
parent a35aaf9659
commit 4597849466
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,7 +420,8 @@ public <V> V getEffectiveFlag(final ProtectedRegion region, Flag<V> flag, @Nulla
} else if (flag == DefaultFlag.BUILD) {
// Legacy behavior -> we can't let people change BUILD on
// the global region
return null;
State value = region.getFlag(DefaultFlag.BUILD);
return value != State.ALLOW ? (V) value : null;
}
}

2
src/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java
View File

@ -1979,7 +1979,7 @@ public void testGetEffectiveFlagGlobalRegionBuildDeny() throws Exception {
FlagValueCalculator result = mock.getFlagCalculator();
// Cannot let users override BUILD on GLOBAL
assertThat(result.getEffectiveFlag(global, DefaultFlag.BUILD, null), equalTo(null));
assertThat(result.getEffectiveFlag(global, DefaultFlag.BUILD, null), equalTo(State.DENY));
}
@Test