Altitude/AlttdGriefPrevention
5
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limited fire protection to claims-enabled worlds.

Browse Source
This commit is contained in:
ryanhamshire committed 2014-12-09 15:11:32 -08:00
1 parent da24015259
commit acbfc5036e
1 file changed
+12 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
+12 -8
View File
@@ -527,7 +527,11 @@ public class BlockEventHandler implements Listener
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onBlockIgnite (BlockIgniteEvent igniteEvent) public void onBlockIgnite (BlockIgniteEvent igniteEvent)
{ {
if(!GriefPrevention.instance.config_fireSpreads && igniteEvent.getCause() != IgniteCause.FLINT_AND_STEEL && igniteEvent.getCause() != IgniteCause.LIGHTNING) //don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(igniteEvent.getBlock().getWorld())) return;
if(!GriefPrevention.instance.config_fireSpreads && igniteEvent.getCause() != IgniteCause.FLINT_AND_STEEL && igniteEvent.getCause() != IgniteCause.LIGHTNING)
{ {
igniteEvent.setCancelled(true); igniteEvent.setCancelled(true);
} }
@@ -539,6 +543,9 @@ public class BlockEventHandler implements Listener
{ {
if(spreadEvent.getSource().getType() != Material.FIRE) return; if(spreadEvent.getSource().getType() != Material.FIRE) return;
//don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(spreadEvent.getBlock().getWorld())) return;
if(!GriefPrevention.instance.config_fireSpreads) if(!GriefPrevention.instance.config_fireSpreads)
{ {
spreadEvent.setCancelled(true); spreadEvent.setCancelled(true);
@@ -552,9 +559,6 @@ public class BlockEventHandler implements Listener
return; return;
} }
//don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(spreadEvent.getBlock().getWorld())) return;
//never spread into a claimed area, regardless of settings //never spread into a claimed area, regardless of settings
if(this.dataStore.getClaimAt(spreadEvent.getBlock().getLocation(), false, null) != null) if(this.dataStore.getClaimAt(spreadEvent.getBlock().getLocation(), false, null) != null)
{ {
@@ -573,7 +577,10 @@ public class BlockEventHandler implements Listener
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onBlockBurn (BlockBurnEvent burnEvent) public void onBlockBurn (BlockBurnEvent burnEvent)
{ {
if(!GriefPrevention.instance.config_fireDestroys) //don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(burnEvent.getBlock().getWorld())) return;
if(!GriefPrevention.instance.config_fireDestroys)
{ {
burnEvent.setCancelled(true); burnEvent.setCancelled(true);
Block block = burnEvent.getBlock(); Block block = burnEvent.getBlock();
@@ -605,9 +612,6 @@ public class BlockEventHandler implements Listener
return; return;
} }
//don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(burnEvent.getBlock().getWorld())) return;
//never burn claimed blocks, regardless of settings //never burn claimed blocks, regardless of settings
if(this.dataStore.getClaimAt(burnEvent.getBlock().getLocation(), false, null) != null) if(this.dataStore.getClaimAt(burnEvent.getBlock().getLocation(), false, null) != null)
{ {