From 36747cb9864f9e18eb8cfe7c4c9dde8dc9d88458 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Wed, 15 May 2013 14:56:23 +0200 Subject: [PATCH] Added /tban, colors for /rawsay, minor changes --- appinfo.properties | 6 +-- buildnumber.properties | 4 +- src/config.yml | 2 +- .../Commands/Command_permban.java | 2 +- .../Commands/Command_plugincontrol.java | 2 +- .../Commands/Command_rawsay.java | 5 ++- .../Commands/Command_tban.java | 41 +++++++++++++++++++ 7 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java diff --git a/appinfo.properties b/appinfo.properties index a8105139..2c519743 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Thu, 09 May 2013 15:32:18 +0200 +#Wed, 15 May 2013 14:55:52 +0200 program.VERSION=2.14 -program.BUILDNUM=182 -program.BUILDDATE=05/09/2013 03\:32 PM +program.BUILDNUM=186 +program.BUILDDATE=05/15/2013 02\:55 PM diff --git a/buildnumber.properties b/buildnumber.properties index 66869c73..3e335259 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Thu May 09 15:32:18 CEST 2013 -build.number=183 +#Wed May 15 14:55:52 CEST 2013 +build.number=187 diff --git a/src/config.yml b/src/config.yml index 8c221c58..6aa940fc 100644 --- a/src/config.yml +++ b/src/config.yml @@ -1,4 +1,4 @@ -# TotalFreedomMod v2.13 Configuration +# TotalFreedomMod v2.14 Configuration # by Madgeek1450 and DarthSalamon # Block placement prevention: diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java index 1cd68ad1..32f5db85 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java @@ -7,7 +7,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true) +@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true) @CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/ ") public class Command_permban extends TFM_Command { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java index 5113f1be..aea04b27 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java @@ -8,7 +8,7 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH) -@CommandParameters(description = "Enable / disable plugins.", usage = "/ < | list >") +@CommandParameters(description = "Enable / disable plugins.", usage = "/ < | list >", aliases = "plc") public class Command_plugincontrol extends TFM_Command { private enum CommandMode diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java index 7ca853df..d6a36a79 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java @@ -2,12 +2,13 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_Util; import org.apache.commons.lang.StringUtils; +import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true) -@CommandParameters(description = "Broadcasts the given message with no extra formatting.", usage = "/ ") +@CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/ ") public class Command_rawsay extends TFM_Command { @Override @@ -15,7 +16,7 @@ public class Command_rawsay extends TFM_Command { if (args.length > 0) { - TFM_Util.bcastMsg(StringUtils.join(args, " ")); + TFM_Util.bcastMsg(ChatColor.translateAlternateColorCodes('&', StringUtils.join(args, " "))); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java new file mode 100644 index 00000000..8730164e --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java @@ -0,0 +1,41 @@ +package me.StevenLawson.TotalFreedomMod.Commands; + +import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; +import me.StevenLawson.TotalFreedomMod.TFM_Util; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) +@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/ ", aliases = "nope") +public class Command_tban extends TFM_Command { + + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length != 1) + { + return false; + } + + Player p; + try + { + p = getPlayer(args[0]); + } + catch (CantFindPlayerException ex) + { + playerMsg(ex.getMessage(), ChatColor.RED); + return true; + } + + TFM_Util.adminAction(sender.getName(), "NOPE: " + p.getName(), true); + TFM_ServerInterface.banUsername(p.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes", + sender.getName(), TFM_Util.parseDateOffset("5m")); + p.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes."); + + return true; + } + +}