Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-07 16:01:32 +01:00
Code Issues Projects Releases Wiki Activity

Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world config settings

Browse Source
This commit is contained in:
Dark Arc 2013-12-11 00:53:49 -05:00
parent 2d90fddbee
commit 96a69aa2ef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -191,7 +191,8 @@ private void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
if (type == DamageCause.BLOCK_EXPLOSION if (type == DamageCause.BLOCK_EXPLOSION
&& (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions && (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions
|| !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation()))) { || (wcfg.explosionFlagCancellation
&& !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation())))) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -201,7 +202,8 @@ private void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
// handled anywhere else // handled anywhere else
if (type == DamageCause.BLOCK_EXPLOSION if (type == DamageCause.BLOCK_EXPLOSION
&& (wcfg.blockOtherExplosions && (wcfg.blockOtherExplosions
|| !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation()))) { || (wcfg.explosionFlagCancellation
&& !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation())))) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }