Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-26 20:26:23 +01:00
Code Issues Projects Releases Wiki Activity

Cache explosion allowed results. Fixes #423

Browse Source
This commit is contained in:
Olof Larsson 2013-09-22 11:34:21 +02:00
parent 3ed6885a4c
commit 2a6937554e
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/massivecraft/factions/listeners/FactionsListenerMain.java
View File

@ -2,8 +2,10 @@ package com.massivecraft.factions.listeners;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -604,6 +606,14 @@ public class FactionsListenerMain implements Listener
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void blockExplosion(EntityExplodeEvent event) public void blockExplosion(EntityExplodeEvent event)
{ {
// Prepare some variables:
// Current faction
Faction faction = null;
// Current allowed
Boolean allowed = true;
// Caching to speed things up.
Map<Faction, Boolean> faction2allowed = new HashMap<Faction, Boolean>();
// If an explosion occurs at a location ... // If an explosion occurs at a location ...
Location location = event.getLocation(); Location location = event.getLocation();
@ -611,20 +621,29 @@ public class FactionsListenerMain implements Listener
if (UConf.isDisabled(location)) return; if (UConf.isDisabled(location)) return;
// Check the entity. Are explosions disabled there? // Check the entity. Are explosions disabled there?
faction = BoardColls.get().getFactionAt(PS.valueOf(location));
if (BoardColls.get().getFactionAt(PS.valueOf(location)).isExplosionsAllowed() == false) allowed = faction.isExplosionsAllowed();
if (allowed == false)
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
faction2allowed.put(faction, allowed);
// Individually check the flag state for each block // Individually check the flag state for each block
Iterator<Block> iter = event.blockList().iterator(); Iterator<Block> iter = event.blockList().iterator();
while (iter.hasNext()) while (iter.hasNext())
{ {
Block block = iter.next(); Block block = iter.next();
Faction faction = BoardColls.get().getFactionAt(PS.valueOf(block)); faction = BoardColls.get().getFactionAt(PS.valueOf(block));
if (faction.isExplosionsAllowed() == false) iter.remove(); allowed = faction2allowed.get(faction);
if (allowed == null)
{
allowed = faction.isExplosionsAllowed();
faction2allowed.put(faction, allowed);
}
if (allowed == false) iter.remove();
} }
} }