From 4e3c9a6b9e7f658b6bbd1451c61a5f270f7ba322 Mon Sep 17 00:00:00 2001 From: JeromSar Date: Mon, 12 Aug 2013 14:41:04 +0200 Subject: [PATCH] Batch format fix --- .../TotalFreedomMod/Commands/Command_tag.java | 13 +++++++------ .../Listener/TFM_PlayerListener.java | 3 ++- .../TotalFreedomMod/TFM_PlayerData.java | 1 - src/me/StevenLawson/TotalFreedomMod/TFM_Util.java | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java index 058f282a..94d5963b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java @@ -14,9 +14,11 @@ import org.bukkit.entity.Player; @CommandParameters(description = "Sets yourself a prefix", usage = "/ < | off | clear | clearall>") public class Command_tag extends TFM_Command { - - public static final List FORBIDDEN_WORDS = Arrays.asList(new String[]{"admin", "owner", "moderator", "developer"}); - + public static final List FORBIDDEN_WORDS = Arrays.asList(new String[] + { + "admin", "owner", "moderator", "developer" + }); + @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { @@ -52,7 +54,7 @@ public class Command_tag extends TFM_Command playerMsg("This can only be used by players."); return true; } - + if (TFM_Util.isStopCommand(args[0])) { TFM_PlayerData.getPlayerData(sender_p).setTag(null); @@ -111,8 +113,7 @@ public class Command_tag extends TFM_Command return false; } - + return false; } - } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 5183b36e..9f1f1d49 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -442,7 +442,8 @@ public class TFM_PlayerListener implements Listener event.setMessage(message); // Set the tag - if (playerdata.getTag() != null) { + if (playerdata.getTag() != null) + { p.setDisplayName((playerdata.getTag() + " " + p.getDisplayName().replaceAll(" ", ""))); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java index d48e5fec..d63934d0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java @@ -522,5 +522,4 @@ public class TFM_PlayerData { return this.tag; } - } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index eabb673d..80f40686 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -906,7 +906,6 @@ public class TFM_Util while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null)); return null; } - public static final List COLOR_POOL = Arrays.asList( ChatColor.DARK_BLUE, ChatColor.DARK_GREEN,