Merge gravy's pull and reformat code

6 files changed, 68 insertions, 111 deletions

diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml
index 3fcd5c2b1..ecc54bf47 100644
--- a/EssentialsProtect/pom.xml
+++ b/EssentialsProtect/pom.xml
@@ -1,22 +1,21 @@
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.essentials3</groupId>
+        <artifactId>BuildAll</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>EssentialsProtect</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Essentials</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <parent>
-    <groupId>net.essentials3</groupId>
-    <artifactId>BuildAll</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  
-  <artifactId>EssentialsProtect</artifactId>
-  <dependencies>   
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>Essentials</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  
 </project>
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
index b91f6740e..e6e00ad6d 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
@@ -1,11 +1,11 @@
 package net.ess3.protect;
 
+import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static net.ess3.I18n._;
+import org.bukkit.plugin.Plugin;
 import net.ess3.api.IEssentials;
 import net.ess3.bukkit.BukkitPlugin;
-import org.bukkit.plugin.Plugin;
 
 
 public class EssentialsConnect
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
index 0cc39069f..6446adc44 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
@@ -6,7 +6,9 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.*;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
 
 
 public class EssentialsProtectBlockListener implements Listener
@@ -23,8 +25,7 @@ public class EssentialsProtectBlockListener implements Listener
 	{
 		final ProtectHolder settings = prot.getSettings();
 		final Block block = event.getBlock();
-		if (block.getType() == Material.OBSIDIAN
-			|| block.getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN)
+		if (block.getType() == Material.OBSIDIAN || block.getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN)
 		{
 			event.setCancelled(settings.getData().getPrevent().isPortalCreation());
 			return;
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
index 2c9a5cdde..0e1b75a7e 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
@@ -36,23 +36,18 @@ public class EssentialsProtectEntityListener implements Listener
 		{
 			final DamageCause cause = event.getCause();
 
-			if (cause == DamageCause.CONTACT
-				&& (Permissions.PREVENTDAMAGE_CONTACT.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.CONTACT && (Permissions.PREVENTDAMAGE_CONTACT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (cause == DamageCause.LAVA
-				&& (Permissions.PREVENTDAMAGE_LAVADAMAGE.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.LAVA && (Permissions.PREVENTDAMAGE_LAVADAMAGE.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (cause == DamageCause.BLOCK_EXPLOSION
-				&& (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.BLOCK_EXPLOSION && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
+					user)))
 			{
 				event.setCancelled(true);
 				return;
@@ -66,52 +61,44 @@ public class EssentialsProtectEntityListener implements Listener
 			final Player attacker = eAttack instanceof Player ? (Player)eAttack : null;
 
 			// PVP Settings
-			if (target instanceof Player && eAttack instanceof Player
-				&& (!Permissions.PVP.isAuthorized(user) || !Permissions.PVP.isAuthorized(attacker)))
+			if (target instanceof Player && eAttack instanceof Player && (!Permissions.PVP.isAuthorized(user) || !Permissions.PVP.isAuthorized(attacker)))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
 			//Creeper explode prevention
-			if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion()
-				|| (Permissions.PREVENTDAMAGE_CREEPER.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion() || (Permissions.PREVENTDAMAGE_CREEPER.isAuthorized(
+					user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
-			if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
-				&& (Permissions.PREVENTDAMAGE_FIREBALL.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && (Permissions.PREVENTDAMAGE_FIREBALL.isAuthorized(
+					user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			
-			if ((event.getEntity() instanceof WitherSkull 
-					 && Permissions.PREVENTDAMAGE_WITHERSKULL.isAuthorized(user)
-					 && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+
+			if ((event.getEntity() instanceof WitherSkull && Permissions.PREVENTDAMAGE_WITHERSKULL.isAuthorized(
+					user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
-			if (eAttack instanceof TNTPrimed
-				&& (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (eAttack instanceof TNTPrimed && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
-			if (edEvent.getDamager() instanceof Projectile
-				&& ((Permissions.PREVENTDAMAGE_PROJECTILES.isAuthorized(user)
-					 && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))
-					|| (((Projectile)edEvent.getDamager()).getShooter() instanceof Player
-						&& (!Permissions.PVP.isAuthorized(user)
-							|| !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter())))))
+			if (edEvent.getDamager() instanceof Projectile && ((Permissions.PREVENTDAMAGE_PROJECTILES.isAuthorized(
+					user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
+					user)) || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player && (!Permissions.PVP.isAuthorized(
+					user) || !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter())))))
 			{
 				event.setCancelled(true);
 				return;
@@ -121,45 +108,35 @@ public class EssentialsProtectEntityListener implements Listener
 		final DamageCause cause = event.getCause();
 		if (target instanceof Player)
 		{
-			if (cause == DamageCause.FALL
-				&& (Permissions.PREVENTDAMAGE_FALL.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.FALL && (Permissions.PREVENTDAMAGE_FALL.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
 
-			if (cause == DamageCause.SUFFOCATION
-				&& (Permissions.PREVENTDAMAGE_SUFFOCATION.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.SUFFOCATION && (Permissions.PREVENTDAMAGE_SUFFOCATION.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
+					user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if ((cause == DamageCause.FIRE
-				 || cause == DamageCause.FIRE_TICK)
-				&& (Permissions.PREVENTDAMAGE_FIRE.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if ((cause == DamageCause.FIRE || cause == DamageCause.FIRE_TICK) && (Permissions.PREVENTDAMAGE_FIRE.isAuthorized(
+					user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (cause == DamageCause.DROWNING
-				&& (Permissions.PREVENTDAMAGE_DROWNING.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.DROWNING && (Permissions.PREVENTDAMAGE_DROWNING.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
 			{
 				event.setCancelled(true);
 				return;
 			}
-			if (cause == DamageCause.LIGHTNING
-				&& (Permissions.PREVENTDAMAGE_LIGHTNING.isAuthorized(user)
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
+			if (cause == DamageCause.LIGHTNING && (Permissions.PREVENTDAMAGE_LIGHTNING.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
+					user)))
 			{
 				event.setCancelled(true);
 			}
-			if (cause == DamageCause.WITHER
-				&& (Permissions.PREVENTDAMAGE_WITHER.isAuthorized(user))
-					&& !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))
+			if (cause == DamageCause.WITHER && (Permissions.PREVENTDAMAGE_WITHER.isAuthorized(user)) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))
 			{
 				event.setCancelled(true);
 				return;
@@ -173,41 +150,33 @@ public class EssentialsProtectEntityListener implements Listener
 		final ProtectHolder settings = prot.getSettings();
 		final int maxHeight = settings.getData().getCreeperMaxHeight();
 
-		if (event.getEntity() instanceof EnderDragon
-			&& settings.getData().getPrevent().isEnderdragonBlockdamage())
+		if (event.getEntity() instanceof EnderDragon && settings.getData().getPrevent().isEnderdragonBlockdamage())
 		{
 			event.setCancelled(true);
 			return;
 		}
-		else if (event.getEntity() instanceof Wither
-			&& settings.getData().getPrevent().isWitherSpawnExplosion())
+		else if (event.getEntity() instanceof Wither && settings.getData().getPrevent().isWitherSpawnExplosion())
 		{
 			event.setCancelled(true);
 			return;
 		}
-		else if (event.getEntity() instanceof Creeper
-				 && (settings.getData().getPrevent().isCreeperExplosion()
-					 || settings.getData().getPrevent().isCreeperBlockdamage()
-					 || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
+		else if (event.getEntity() instanceof Creeper && (settings.getData().getPrevent().isCreeperExplosion() || settings.getData().getPrevent().isCreeperBlockdamage() || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
 		{
 			event.setCancelled(true);
 			event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
 			return;
 		}
-		else if (event.getEntity() instanceof TNTPrimed
-				 && settings.getData().getPrevent().isTntExplosion())
+		else if (event.getEntity() instanceof TNTPrimed && settings.getData().getPrevent().isTntExplosion())
 		{
 			event.setCancelled(true);
 			return;
 		}
-		else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
-				 && settings.getData().getPrevent().isFireballExplosion())
+		else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && settings.getData().getPrevent().isFireballExplosion())
 		{
 			event.setCancelled(true);
 			return;
 		}
-		else if ((event.getEntity() instanceof WitherSkull)
-			     && settings.getData().getPrevent().isWitherskullExplosion())
+		else if ((event.getEntity() instanceof WitherSkull) && settings.getData().getPrevent().isWitherskullExplosion())
 		{
 			event.setCancelled(true);
 			return;
@@ -217,23 +186,17 @@ public class EssentialsProtectEntityListener implements Listener
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onEntityTarget(final EntityTargetEvent event)
 	{
-		final Entity entity = event.getTarget();	
-		if(entity == null)
+		final Entity entity = event.getTarget();
+		if (entity == null)
 		{
 			return;
 		}
-		
+
 		if (entity.getType() == EntityType.PLAYER)
 		{
 			final Player user = (Player)event.getTarget();
-			if ((event.getReason() == TargetReason.CLOSEST_PLAYER
-				 || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY
-				 || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET
-				 || event.getReason() == TargetReason.RANDOM_TARGET
-				 || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
-				 || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET)
-				&& !prot.getSettings().getData().getPrevent().isEntitytarget()
-				&& !Permissions.ENTITY_TARGET_BYPASS.isAuthorized(user, event.getEntity().getType().getName().toLowerCase()))
+			if ((event.getReason() == TargetReason.CLOSEST_PLAYER || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET || event.getReason() == TargetReason.RANDOM_TARGET || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) && !prot.getSettings().getData().getPrevent().isEntitytarget() && !Permissions.ENTITY_TARGET_BYPASS.isAuthorized(
+					user, event.getEntity().getType().getName().toLowerCase()))
 			{
 				event.setCancelled(true);
 			}
@@ -244,8 +207,7 @@ public class EssentialsProtectEntityListener implements Listener
 	public void onExplosionPrime(final ExplosionPrimeEvent event)
 	{
 		final ProtectHolder settings = prot.getSettings();
-		if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
-			&& settings.getData().getPrevent().isFireballFire())
+		if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && settings.getData().getPrevent().isFireballFire())
 		{
 			event.setFire(false);
 		}
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
index 1f71944a0..c12dc4a52 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
@@ -22,9 +22,7 @@ public class EssentialsProtectWeatherListener implements Listener
 	{
 		final ProtectHolder settings = prot.getSettings();
 
-		if (!event.isCancelled()
-			&& settings.getData().isDisableStorm()
-			&& event.toWeatherState())
+		if (!event.isCancelled() && settings.getData().isDisableStorm() && event.toWeatherState())
 		{
 			event.setCancelled(true);
 		}
@@ -35,8 +33,7 @@ public class EssentialsProtectWeatherListener implements Listener
 	{
 		final ProtectHolder settings = prot.getSettings();
 
-		if (!event.isCancelled()
-			&& settings.getData().isDisableLighting())
+		if (!event.isCancelled() && settings.getData().isDisableLighting())
 		{
 			event.setCancelled(true);
 		}
@@ -47,9 +44,7 @@ public class EssentialsProtectWeatherListener implements Listener
 	{
 		final ProtectHolder settings = prot.getSettings();
 
-		if (!event.isCancelled()
-			&& settings.getData().isDisableThunder()
-			&& event.toThunderState())
+		if (!event.isCancelled() && settings.getData().isDisableThunder() && event.toThunderState())
 		{
 			event.setCancelled(true);
 		}
diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java
index 9890231d5..7ab2c0ea5 100644
--- a/EssentialsProtect/src/net/ess3/protect/Permissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java
@@ -1,15 +1,15 @@
 package net.ess3.protect;
 
 import java.util.Locale;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 import net.ess3.api.IPermission;
 import net.ess3.bukkit.PermissionFactory;
 import net.ess3.permissions.DotStarPermission;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
 
 
 public enum Permissions implements IPermission
-{	
+{
 	PVP(PermissionDefault.TRUE),
 	PREVENTDAMAGE_FALL(PermissionDefault.FALSE),
 	PREVENTDAMAGE_CREEPER(PermissionDefault.FALSE),
@@ -73,5 +73,5 @@ public enum Permissions implements IPermission
 		return PermissionFactory.checkPermission(sender, this);
 	}
 
-		public static DotStarPermission ENTITY_TARGET_BYPASS = new DotStarPermission("essentials.protect.entitytarget.bypass");
+	public static DotStarPermission ENTITY_TARGET_BYPASS = new DotStarPermission("essentials.protect.entitytarget.bypass");
 }