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

Merge pull request #103 from wizjany/master

Browse Source 
Fixed some derpy fire handling
This commit is contained in:
MonsieurApple 2011-05-17 07:05:09 -07:00
commit 49bdccf020
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
View File

@ -293,7 +293,7 @@ public void onBlockIgnite(BlockIgniteEvent event) {
return;
}
}
if (wcfg.useRegions) {
Vector pt = toVector(block);
Player player = event.getPlayer();
@ -316,7 +316,8 @@ public void onBlockIgnite(BlockIgniteEvent event) {
}
}
if (wcfg.highFreqFlags && isFireSpread && set.allows(DefaultFlag.FIRE_SPREAD)) {
if (wcfg.highFreqFlags && isFireSpread
&& !set.allows(DefaultFlag.FIRE_SPREAD)) {
event.setCancelled(true);
return;
}
@ -363,6 +364,19 @@ public void onBlockBurn(BlockBurnEvent event) {
return;
}
}
if (wcfg.useRegions) {
Block block = event.getBlock();
Vector pt = toVector(block);
RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
ApplicableRegionSet set = mgr.getApplicableRegions(pt);
if (!set.allows(DefaultFlag.FIRE_SPREAD)) {
event.setCancelled(true);
return;
}
}
}
/**