From e013ac787d9bd4efc7ee86c297e3bb436521dd7e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 30 Nov 2010 20:14:47 -0800 Subject: [PATCH] Removed pointless check, added comment for adminChatToggle in vminecraftCommands. --- vminecraftCommands.java | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/vminecraftCommands.java b/vminecraftCommands.java index 9020fe39d..5e7e9a056 100644 --- a/vminecraftCommands.java +++ b/vminecraftCommands.java @@ -46,22 +46,28 @@ public class vminecraftCommands{ cl.registerAlias("/wrists", "/suicide"); cl.registerAlias("/ci", "/clearinventory"); } -public static int adminChatToggle(Player player, String[] args) + //===================================================================== + //Function: adminChatToggle (/a) + //Input: Player player: The player using the command + //Output: int: Exit Code + //Use: Toggles the player into admin chat. Every message they + // send will be piped to admin chat. + //===================================================================== + + public static int adminChatToggle(Player player) { if(vminecraftSettings.getInstance().adminChatToggle()) { - if (vminecraftSettings.getInstance().cmdAdminToggle) { - //If the player is already toggled for admin chat, remove them - if (vminecraftSettings.getInstance().isAdminToggled(player.getName())) { - player.sendMessage(Colors.Red + "Admin Chat Toggle = off"); - vminecraftSettings.getInstance().removeAdminToggled(player.getName()); - //Otherwise include them - } else { - player.sendMessage(Colors.Blue + "Admin Chat Toggled on"); - vminecraftSettings.getInstance().addAdminToggled(player.getName()); - } - return EXIT_SUCCESS; + //If the player is already toggled for admin chat, remove them + if (vminecraftSettings.getInstance().isAdminToggled(player.getName())) { + player.sendMessage(Colors.Red + "Admin Chat Toggle = off"); + vminecraftSettings.getInstance().removeAdminToggled(player.getName()); + //Otherwise include them + } else { + player.sendMessage(Colors.Blue + "Admin Chat Toggled on"); + vminecraftSettings.getInstance().addAdminToggled(player.getName()); } + return EXIT_SUCCESS; } return EXIT_FAIL; }