From d23c99f3c59333b3fab43dc1fea86d1cd53c67d8 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 16 Sep 2012 17:33:26 -0400 Subject: [PATCH] Blocked the /gamemode command. Made it so /smite actually blocks non-superadmins :D --- .../TotalFreedomMod/Commands/Command_smite.java | 11 ++++++----- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 7 ++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java index 6f81db70..a740edf4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java @@ -16,16 +16,17 @@ public class Command_smite extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!TFM_Util.isUserSuperadmin(sender)) - { - sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); - } - if (args.length != 1) { return false; } + if (!TFM_Util.isUserSuperadmin(sender)) + { + sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); + return true; + } + Player p; try { diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 787b7192..aa171372 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -444,6 +444,11 @@ public class TFM_PlayerListener implements Listener p.sendMessage(ChatColor.GRAY + "This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise."); block_command = true; } + else if (Pattern.compile("^/gamemode").matcher(command).find()) + { + p.sendMessage(ChatColor.GRAY + "Use /creative and /survival to set your gamemode."); + block_command = true; + } else if (Pattern.compile("^/ban").matcher(command).find()) { if (!Pattern.compile("^/banlist").matcher(command).find()) @@ -473,7 +478,7 @@ public class TFM_PlayerListener implements Listener if (block_command) { - p.sendMessage(ChatColor.RED + "That command is prohibited."); + p.sendMessage(ChatColor.GRAY + "That command is blocked."); event.setCancelled(true); return; }