Merge gravy's pull and reformat code

3 files changed, 38 insertions, 63 deletions

diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
index 9deea4de1..d1ad37da8 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
@@ -2,14 +2,6 @@ package net.ess3.signs.listeners;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
-import net.ess3.signs.Signs;
-import net.ess3.utils.FormatUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -18,6 +10,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
+import net.ess3.signs.Signs;
+import net.ess3.utils.FormatUtil;
 
 
 public class SignBlockListener implements Listener
@@ -58,8 +58,7 @@ public class SignBlockListener implements Listener
 
 			for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 			{
-				if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName())
-					&& !sign.onSignBreak(block, player, ess))
+				if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()) && !sign.onSignBreak(block, player, ess))
 				{
 					return true;
 				}
@@ -73,8 +72,7 @@ public class SignBlockListener implements Listener
 		}
 		for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 		{
-			if (sign.getBlocks().contains(block.getType())
-				&& !sign.onBlockBreak(block, player, ess))
+			if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, player, ess))
 			{
 				LOGGER.log(Level.INFO, "A block was protected by a sign.");
 				return true;
@@ -105,8 +103,7 @@ public class SignBlockListener implements Listener
 				event.setCancelled(true);
 				return;
 			}
-			if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName())
-				&& !sign.onSignCreate(event, ess))
+			if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName()) && !sign.onSignCreate(event, ess))
 			{
 				event.setCancelled(true);
 				return;
@@ -123,24 +120,20 @@ public class SignBlockListener implements Listener
 		}
 
 		final Block against = event.getBlockAgainst();
-		if ((against.getTypeId() == WALL_SIGN
-			 || against.getTypeId() == SIGN_POST)
-			&& EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against)))
+		if ((against.getTypeId() == WALL_SIGN || against.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against)))
 		{
 			event.setCancelled(true);
 			return;
 		}
 		final Block block = event.getBlock();
-		if (block.getTypeId() == WALL_SIGN
-			|| block.getTypeId() == SIGN_POST)
+		if (block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST)
 		{
 			return;
 		}
 		for (Signs signs : Signs.values())
 		{
 			final EssentialsSign sign = signs.getSign();
-			if (sign.getBlocks().contains(block.getType())
-				&& !sign.onBlockPlace(block, event.getPlayer(), ess))
+			if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPlace(block, event.getPlayer(), ess))
 			{
 				event.setCancelled(true);
 				return;
@@ -157,18 +150,15 @@ public class SignBlockListener implements Listener
 		}
 
 		final Block block = event.getBlock();
-		if (((block.getTypeId() == WALL_SIGN
-			  || block.getTypeId() == SIGN_POST)
-			 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-			|| EssentialsSign.checkIfBlockBreaksSigns(block))
+		if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
+				new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 		{
 			event.setCancelled(true);
 			return;
 		}
 		for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 		{
-			if (sign.getBlocks().contains(block.getType())
-				&& !sign.onBlockBurn(block, ess))
+			if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBurn(block, ess))
 			{
 				event.setCancelled(true);
 				return;
@@ -185,18 +175,15 @@ public class SignBlockListener implements Listener
 		}
 
 		final Block block = event.getBlock();
-		if (((block.getTypeId() == WALL_SIGN
-			  || block.getTypeId() == SIGN_POST)
-			 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-			|| EssentialsSign.checkIfBlockBreaksSigns(block))
+		if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
+				new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 		{
 			event.setCancelled(true);
 			return;
 		}
 		for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 		{
-			if (sign.getBlocks().contains(block.getType())
-				&& !sign.onBlockIgnite(block, ess))
+			if (sign.getBlocks().contains(block.getType()) && !sign.onBlockIgnite(block, ess))
 			{
 				event.setCancelled(true);
 				return;
@@ -214,18 +201,15 @@ public class SignBlockListener implements Listener
 
 		for (Block block : event.getBlocks())
 		{
-			if (((block.getTypeId() == WALL_SIGN
-				  || block.getTypeId() == SIGN_POST)
-				 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-				|| EssentialsSign.checkIfBlockBreaksSigns(block))
+			if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
+					new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 			{
 				event.setCancelled(true);
 				return;
 			}
 			for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 			{
-				if (sign.getBlocks().contains(block.getType())
-					&& !sign.onBlockPush(block, ess))
+				if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess))
 				{
 					event.setCancelled(true);
 					return;
@@ -245,18 +229,15 @@ public class SignBlockListener implements Listener
 		if (event.isSticky())
 		{
 			final Block block = event.getBlock();
-			if (((block.getTypeId() == WALL_SIGN
-				  || block.getTypeId() == SIGN_POST)
-				 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-				|| EssentialsSign.checkIfBlockBreaksSigns(block))
+			if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
+					new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 			{
 				event.setCancelled(true);
 				return;
 			}
 			for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 			{
-				if (sign.getBlocks().contains(block.getType())
-					&& !sign.onBlockPush(block, ess))
+				if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess))
 				{
 					event.setCancelled(true);
 					return;
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
index 2be907813..8fdebce8e 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
@@ -1,8 +1,5 @@
 package net.ess3.signs.listeners;
 
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -10,6 +7,9 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 
 
 public class SignEntityListener implements Listener
@@ -33,10 +33,8 @@ public class SignEntityListener implements Listener
 
 		for (Block block : event.blockList())
 		{
-			if (((block.getTypeId() == Material.WALL_SIGN.getId()
-				  || block.getTypeId() == Material.SIGN_POST.getId())
-				 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-				|| EssentialsSign.checkIfBlockBreaksSigns(block))
+			if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign(
+					new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 			{
 				event.setCancelled(true);
 				return;
@@ -61,18 +59,15 @@ public class SignEntityListener implements Listener
 		}
 
 		final Block block = event.getBlock();
-		if (((block.getTypeId() == Material.WALL_SIGN.getId()
-			  || block.getTypeId() == Material.SIGN_POST.getId())
-			 && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block)))
-			|| EssentialsSign.checkIfBlockBreaksSigns(block))
+		if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign(
+				new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
 		{
 			event.setCancelled(true);
 			return;
 		}
 		for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 		{
-			if (sign.getBlocks().contains(block.getType())
-				&& !sign.onBlockBreak(block, ess))
+			if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, ess))
 			{
 				event.setCancelled(true);
 				return;
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
index 8c6fc6899..f1460f411 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
@@ -1,8 +1,5 @@
 package net.ess3.signs.listeners;
 
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -11,6 +8,9 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 
 
 public class SignPlayerListener implements Listener
@@ -55,8 +55,7 @@ public class SignPlayerListener implements Listener
 		{
 			for (EssentialsSign sign : plugin.getSettings().getEnabledSigns())
 			{
-				if (sign.getBlocks().contains(block.getType())
-					&& !sign.onBlockInteract(block, event.getPlayer(), ess))
+				if (sign.getBlocks().contains(block.getType()) && !sign.onBlockInteract(block, event.getPlayer(), ess))
 				{
 					event.setCancelled(true);
 					return;