From 8288cfc44a65b02c71b90e066171733fd588022d Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Tue, 6 Nov 2012 12:35:48 -0600
Subject: [PATCH] minor cleanup of hanging explosion protection code

---
 .../listeners/FactionsEntityListener.java     | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 93d4756f..d682be82 100644
--- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -505,44 +505,30 @@ public class FactionsEntityListener implements Listener
 			
 			if
 			(
-					(faction.isNone() && Conf.wildernessBlockCreepers && !Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName()))
-					||
-					(faction.isNormal() && (online ? Conf.territoryBlockCreepers : Conf.territoryBlockCreepersWhenOffline))
-					||
-					(faction.isWarZone() && Conf.warZoneBlockCreepers)
-					||
-					faction.isSafeZone()
+				(
+					faction.isNone()
+					&& !Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName())
+					&& (Conf.wildernessBlockCreepers || Conf.wildernessBlockFireballs || Conf.wildernessBlockTNT)
+				)
+				||
+				(
+					faction.isNormal()
+					&&
+					( online
+						? (Conf.territoryBlockCreepers || Conf.territoryBlockFireballs || Conf.territoryBlockTNT)
+						: (Conf.territoryBlockCreepersWhenOffline || Conf.territoryBlockFireballsWhenOffline || Conf.territoryBlockTNTWhenOffline)
+					)
+				)
+				||
+				(
+					faction.isWarZone()
+					&& (Conf.warZoneBlockCreepers || Conf.warZoneBlockFireballs || Conf.warZoneBlockTNT)
+				)
+				||
+				faction.isSafeZone()
 			)
 			{
-				// creeper which needs prevention
-				event.setCancelled(true);
-			}
-			else if
-			(
-					(faction.isNone() && Conf.wildernessBlockFireballs && !Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName()))
-					||
-					(faction.isNormal() && (online ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline))
-					||
-					(faction.isWarZone() && Conf.warZoneBlockFireballs)
-					||
-					faction.isSafeZone()
-			)
-			{
-				// ghast fireball which needs prevention
-				event.setCancelled(true);
-			}
-			else if
-			(
-					(faction.isNone() && Conf.wildernessBlockTNT && ! Conf.worldsNoWildernessProtection.contains(loc.getWorld().getName()))
-					||
-					(faction.isNormal() && ( online ? Conf.territoryBlockTNT : Conf.territoryBlockTNTWhenOffline ))
-					||
-					(faction.isWarZone() && Conf.warZoneBlockTNT)
-					||
-					(faction.isSafeZone() && Conf.safeZoneBlockTNT)
-			)
-			{
-				// TNT which needs prevention
+				// explosion which needs prevention
 				event.setCancelled(true);
 			}
 		}