From 1281843d452e2c92839ab5e52604089a684e26ef Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 28 Feb 2012 11:17:54 -0800 Subject: [PATCH] Removing redundancy in most commands --- .../commands/general/AddlevelsCommand.java | 5 -- .../commands/general/AddxpCommand.java | 5 -- .../commands/general/ClearmyspawnCommand.java | 2 +- .../commands/general/McstatsCommand.java | 4 -- .../commands/general/MmoeditCommand.java | 5 -- .../commands/general/WhoisCommand.java | 4 -- .../commands/general/XprateCommand.java | 4 -- .../nossr50/commands/mc/McabilityCommand.java | 5 -- .../gmail/nossr50/commands/mc/MccCommand.java | 4 -- .../nossr50/commands/mc/McgodCommand.java | 4 -- .../nossr50/commands/mc/McmmoCommand.java | 4 -- .../nossr50/commands/mc/McrefreshCommand.java | 4 -- .../gmail/nossr50/commands/mc/Mcremove.java | 52 ------------------- .../nossr50/commands/mc/MctopCommand.java | 4 -- .../nossr50/commands/party/AcceptCommand.java | 4 -- .../nossr50/commands/party/InviteCommand.java | 4 -- .../nossr50/commands/party/PCommand.java | 4 -- .../nossr50/commands/party/PartyCommand.java | 4 -- .../nossr50/commands/party/PtpCommand.java | 4 -- src/main/java/com/gmail/nossr50/mcMMO.java | 1 + 20 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 src/main/java/com/gmail/nossr50/commands/mc/Mcremove.java diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java index 398c692c7..5144652f1 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java @@ -34,11 +34,6 @@ public class AddlevelsCommand implements CommandExecutor{ return true; } - if (!LoadProperties.addlevelsEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } - if (!(sender instanceof Player)) { if (args.length < 2) { System.out.println("Usage is /addlevels playername skillname levels"); diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index a109b5e5d..46c9dc5fb 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -33,11 +33,6 @@ public class AddxpCommand implements CommandExecutor { return true; } - if (!LoadProperties.addxpEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } - if (!(sender instanceof Player)) { if (args.length < 2) { // No console aliasing yet diff --git a/src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java b/src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java index 61100860a..16fb54b2f 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java @@ -20,7 +20,7 @@ public class ClearmyspawnCommand implements CommandExecutor { sender.sendMessage("This command is not enabled."); return true; } - + if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java index b88005503..39acfe903 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java @@ -25,10 +25,6 @@ public class McstatsCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mcstatsEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } Player player = null; if (sender instanceof Player) { diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java index ca4569d79..c46d61b95 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java @@ -34,11 +34,6 @@ public class MmoeditCommand implements CommandExecutor { return true; } - if (!LoadProperties.mmoeditEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } - if (!(sender instanceof Player)) { if (args.length < 2) { System.out.println("Usage is /mmoedit playername skillname newvalue"); diff --git a/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java b/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java index 4fe143f10..f89be5e8a 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java @@ -25,10 +25,6 @@ public class WhoisCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.whoisEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } Player player = null; if (sender instanceof Player) { diff --git a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java index d70041eac..01c3e9f94 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java @@ -19,10 +19,6 @@ public class XprateCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.xprateEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { if(args.length <= 0) diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java index af2fcba43..929f346db 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java @@ -25,11 +25,6 @@ public class McabilityCommand implements CommandExecutor { return true; } - if (!LoadProperties.mcabilityEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } - if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java index 336370319..0fa67b661 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java @@ -13,10 +13,6 @@ import com.gmail.nossr50.locale.mcLocale; public class MccCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mccEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java index ff980ea6d..621d54321 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java @@ -15,10 +15,6 @@ import com.gmail.nossr50.locale.mcLocale; public class McgodCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mcgodEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java index 308ece808..946550aef 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java @@ -14,10 +14,6 @@ public class McmmoCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mcmmoEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java index 7f376c094..d01861b74 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java @@ -22,10 +22,6 @@ public class McrefreshCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mcrefreshEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/Mcremove.java b/src/main/java/com/gmail/nossr50/commands/mc/Mcremove.java deleted file mode 100644 index 21416a68d..000000000 --- a/src/main/java/com/gmail/nossr50/commands/mc/Mcremove.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gmail.nossr50.commands.mc; - -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import com.gmail.nossr50.mcPermissions; -import com.gmail.nossr50.config.LoadProperties; -import com.gmail.nossr50.locale.mcLocale; - -public class Mcremove implements CommandExecutor { - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - Player player = null; - - if (sender instanceof Player) { - player = (Player) sender; - } - - if (player != null && !mcPermissions.getInstance().mcremove(player)) { - player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission")); - return true; - } - - if (!LoadProperties.mcremoveEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } - - if (!(sender instanceof Player)) { - sender.sendMessage("This command does not support console useage."); - return true; - } - - if(args.length == 1) - { - sender.sendMessage("Correct usage is /mcremove [Player Name]"); - } - - //If the server is using MySQL - if(LoadProperties.useMySQL) - { - - } else { - - } - - return true; - } -} \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java index 031c4f221..7ad739a14 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java @@ -20,10 +20,6 @@ import com.gmail.nossr50.skills.Skills; public class MctopCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.mctopEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java index 5a2492f63..c3b39b9c0 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java @@ -16,10 +16,6 @@ import com.gmail.nossr50.party.Party; public class AcceptCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.acceptEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java index 02554e04d..b03d8101f 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java @@ -23,10 +23,6 @@ public class InviteCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.inviteEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PCommand.java index 3ce35ec30..1e02742ef 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PCommand.java @@ -26,10 +26,6 @@ public class PCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.partyEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } // Console message? if (!(sender instanceof Player)) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index d39db762b..90dde6af7 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -17,10 +17,6 @@ import com.gmail.nossr50.party.Party; public class PartyCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.partyEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java index 175d444c1..c734eea99 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -22,10 +22,6 @@ public class PtpCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!LoadProperties.ptpEnable) { - sender.sendMessage("This command is not enabled."); - return true; - } if (!(sender instanceof Player)) { sender.sendMessage("This command does not support console useage."); diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 7ae4b3959..006964e94 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -296,6 +296,7 @@ public class mcMMO extends JavaPlugin getCommand("woodcutting").setExecutor(new WoodcuttingCommand()); //Mc* commands + if(LoadProperties.mcremoveEnable) getCommand("mcremove").setExecutor(new McremoveCommand()); if(LoadProperties.mcabilityEnable) getCommand("mcability").setExecutor(new McabilityCommand()); if(LoadProperties.mccEnable) getCommand("mcc").setExecutor(new MccCommand()); if(LoadProperties.mcgodEnable) getCommand("mcgod").setExecutor(new McgodCommand());