From 56a5a7304a6a704a58def28293191308de2a0cf7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Mar 2014 16:17:00 +0100 Subject: [PATCH] Blocked /gcmd from bypasing the command blocker --- buildnumber.properties | 4 ++-- .../Commands/Command_gcmd.java | 21 +++++++------------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 6e828e61..e95cd32b 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Mar 18 16:06:56 CET 2014 -build.number=702 +#Tue Mar 18 16:16:22 CET 2014 +build.number=703 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java index cede6dd5..37b91096 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java @@ -1,5 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -28,26 +30,17 @@ public class Command_gcmd extends TFM_Command return true; } - String outcommand = ""; - try + final String outCommand = StringUtils.join(args, " ", 1, args.length); + + if (TFM_CommandBlocker.getInstance().isCommandBlocked(outCommand, sender)) { - StringBuilder outcommand_bldr = new StringBuilder(); - for (int i = 1; i < args.length; i++) - { - outcommand_bldr.append(args[i]).append(" "); - } - outcommand = outcommand_bldr.toString().trim(); - } - catch (Throwable ex) - { - sender.sendMessage(ChatColor.GRAY + "Error building command: " + ex.getMessage()); return true; } try { - playerMsg("Sending command as " + player.getName() + ": " + outcommand); - if (server.dispatchCommand(player, outcommand)) + playerMsg("Sending command as " + player.getName() + ": " + outCommand); + if (server.dispatchCommand(player, outCommand)) { playerMsg("Command sent."); }