Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-03 10:50:27 +02:00
Code Issues Projects Releases Wiki Activity

Demand most action commands to be run from the console.

Browse Source 
For players they either have no extra value over vanilla commands or
they have too high of an abuse potential.
This commit is contained in:
asofold 2014-07-27 16:53:21 +02:00
parent 7c967ab2e2
commit c99612154c
6 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/AbstractCommand.java
View File

@ -12,7 +12,9 @@ import java.util.Set;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player;
/**
* Base command class, featuring some features.<br>
@ -50,6 +52,34 @@ public abstract class AbstractCommand<A> implements TabExecutor{
return b.toString();
}
/**
*
* @param sender
* @return True if sender is a Player, otherwise false is returned and a message sent.
*/
public static boolean demandPlayer(CommandSender sender) {
if (sender instanceof Player) {
return true;
} else {
sender.sendMessage("[NoCheatPlus] A player is required to run this command.");
return false;
}
}
/**
*
* @param sender
* @return True if sender is a Player, otherwise false is returned and a message sent.
*/
public static boolean demandConsoleCommandSender(CommandSender sender) {
if (sender instanceof ConsoleCommandSender) {
return true;
} else {
sender.sendMessage("[NoCheatPlus] This command can only be run from the console.");
return false;
}
}
////////////////
// Not static.
////////////////

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/actions/BanCommand.java
View File

@ -25,7 +25,9 @@ public class BanCommand extends BaseCommand {
@Override
public boolean onCommand(final CommandSender sender, Command command, String label, String[] args) {
if (!demandConsoleCommandSender(sender)) {
return true;
}
// TODO: Consider supporting vanilla syntax or removing this command :p.
// Args contains "ban" as first arg.

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/actions/KickCommand.java
View File

@ -21,6 +21,9 @@ public class KickCommand extends BaseCommand {
@Override
public boolean onCommand(final CommandSender sender, Command command, String label, String[] args) {
if (!demandConsoleCommandSender(sender)) {
return true;
}
// Args contains "kick" as first arg.
if (args.length < 2) return false;
final String name = args[1];

9
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/actions/TellCommand.java
View File

@ -26,7 +26,12 @@ public class TellCommand extends BaseCommand {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, final String[] args) {
if (args.length < 3) return false;
if (!demandConsoleCommandSender(sender)) {
return true;
}
if (args.length < 3) {
return false;
}
final String name = args[1].trim();
final String message = AbstractCommand.join(args, 2);
tell(name, message);
@ -39,7 +44,7 @@ public class TellCommand extends BaseCommand {
}
/* (non-Javadoc)
* @see fr.neatmonster.nocheatplus.command.actions.delay.DelayableCommand#onTabComplete(org.bukkit.command.CommandSender, org.bukkit.command.Command, java.lang.String, java.lang.String[])
* @see fr.neatmonster.nocheatplus.command.BaseCommand#onTabComplete(org.bukkit.command.CommandSender, org.bukkit.command.Command, java.lang.String, java.lang.String[])
*/
@Override
public List<String> onTabComplete(CommandSender sender, Command command,

9
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/actions/delay/DelayCommand.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.plugin.java.JavaPlugin;
import fr.neatmonster.nocheatplus.command.AbstractCommand;
@ -18,12 +19,14 @@ public class DelayCommand extends DelayableCommand {
public DelayCommand(JavaPlugin plugin){
super(plugin, "delay", Permissions.COMMAND_DELAY, 1, 0, true);
demandConsoleCommandSender = true;
}
@Override
public boolean execute(CommandSender sender, Command command, String label,
String[] alteredArgs, long delay) {
if (alteredArgs.length < 2) return false;
public boolean execute(CommandSender sender, Command command, String label, String[] alteredArgs, long delay) {
if (alteredArgs.length < 2) {
return false;
}
final String cmd = AbstractCommand.join(alteredArgs, 1);
schedule(new Runnable() {
@Override

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/actions/delay/DelayableCommand.java
View File

@ -52,6 +52,7 @@ public abstract class DelayableCommand extends BaseCommand {
protected final int delayIndex;
protected final boolean mustHaveDelay;
protected final int delayPreset;
protected boolean demandConsoleCommandSender = false;
/**
* (Delay is not obligatory, inserted after the first argument.)
@ -115,6 +116,9 @@ public abstract class DelayableCommand extends BaseCommand {
@Override
public boolean onCommand(final CommandSender sender, final Command command,
final String label, final String[] args ) {
if (demandConsoleCommandSender && !demandConsoleCommandSender(sender)) {
return true;
}
// Parse the delay and alter the args accordingly.
long delay = parseDelay(args, delayIndex, delayPreset);
String[] alteredArgs;