Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added proper feedback to default commands.

Browse Source
This commit is contained in:
EvilSeph 2012-11-15 22:52:04 -05:00
parent 6ebc1cd7ce
commit f1ac9196bc
10 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/command/defaults/ClearCommand.java
View File

@ -60,9 +60,10 @@ public class ClearCommand extends VanillaCommand {
int data = args.length >= 3 ? getInteger(sender, args[2], 0) : -1; int data = args.length >= 3 ? getInteger(sender, args[2], 0) : -1;
int count = player.getInventory().clear(id, data); int count = player.getInventory().clear(id, data);
Command.broadcastCommandMessage(sender, "Cleared the inventory of " + player.getDisplayName() + ", removing " + count + " items"); Command.broadcastCommandMessage(sender, "Cleared the inventory of " + player.getDisplayName() + ", removing " + count + " items");
} else { } else {
sender.sendMessage(ChatColor.RED + "Can't find user " + args[0]); sender.sendMessage(ChatColor.RED + "Can't find player " + args[0]);
} }
return true; return true;

3
src/main/java/org/bukkit/command/defaults/DeopCommand.java
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil; import org.bukkit.util.StringUtil;
@ -36,7 +37,7 @@ public class DeopCommand extends VanillaCommand {
((Player) player).sendMessage(ChatColor.YELLOW + "You are no longer op!"); ((Player) player).sendMessage(ChatColor.YELLOW + "You are no longer op!");
} }
sender.sendMessage("De-opped " + args[0]); Command.broadcastCommandMessage(sender, "De-opped " + args[0]);
return true; return true;
} }

8
src/main/java/org/bukkit/command/defaults/ExpCommand.java
View File

@ -49,10 +49,10 @@ public class ExpCommand extends VanillaCommand {
if (isLevel) { if (isLevel) {
if (isTaking) { if (isTaking) {
player.giveExpLevels(-amount); player.giveExpLevels(-amount);
sender.sendMessage("Taken " + amount + " level(s) from " + player.getName()); Command.broadcastCommandMessage(sender, "Taken " + amount + " level(s) from " + player.getName());
} else { } else {
player.giveExpLevels(amount); player.giveExpLevels(amount);
sender.sendMessage("Given " + amount + " level(s) to " + player.getName()); Command.broadcastCommandMessage(sender, "Given " + amount + " level(s) to " + player.getName());
} }
} else { } else {
if (isTaking) { if (isTaking) {
@ -60,11 +60,11 @@ public class ExpCommand extends VanillaCommand {
return false; return false;
} else { } else {
player.giveExp(amount); player.giveExp(amount);
sender.sendMessage("Given " + amount + " experience to " + player.getName()); Command.broadcastCommandMessage(sender, "Given " + amount + " experience to " + player.getName());
} }
} }
} else { } else {
sender.sendMessage("Can't find user, was one provided?\n" + ChatColor.RED + "Usage: " + usageMessage); sender.sendMessage("Can't find player, was one provided?\n" + ChatColor.RED + "Usage: " + usageMessage);
return false; return false;
} }

6
src/main/java/org/bukkit/command/defaults/GameModeCommand.java
View File

@ -67,16 +67,16 @@ public class GameModeCommand extends VanillaCommand {
sender.sendMessage("Game mode change for " + player.getName() + " failed!"); sender.sendMessage("Game mode change for " + player.getName() + " failed!");
} else { } else {
if (player == sender) { if (player == sender) {
Command.broadcastCommandMessage(sender, "Set own game mode to " + mode.toString() + " mode", false); Command.broadcastCommandMessage(sender, "Set own game mode to " + mode.toString() + " mode");
} else { } else {
Command.broadcastCommandMessage(sender, "Set " + player.getName() + "'s game mode to " + mode.toString() + " mode", false); Command.broadcastCommandMessage(sender, "Set " + player.getName() + "'s game mode to " + mode.toString() + " mode");
} }
} }
} else { } else {
sender.sendMessage(player.getName() + " already has game mode " + mode.getValue()); sender.sendMessage(player.getName() + " already has game mode " + mode.getValue());
} }
} else { } else {
sender.sendMessage("Can't find user " + playerArg); sender.sendMessage("Can't find player " + playerArg);
} }
return true; return true;

2
src/main/java/org/bukkit/command/defaults/GameRuleCommand.java
View File

@ -37,7 +37,7 @@ public class GameRuleCommand extends VanillaCommand {
String value = args[1]; String value = args[1];
world.setGameRuleValue(rule, value); world.setGameRuleValue(rule, value);
Command.broadcastCommandMessage(sender, "Game rule has been updated"); Command.broadcastCommandMessage(sender, "Game rule " + rule + " has been set to: " + value);
} else { } else {
String value = world.getGameRuleValue(rule); String value = world.getGameRuleValue(rule);
sender.sendMessage(rule + " = " + value); sender.sendMessage(rule + " = " + value);

2
src/main/java/org/bukkit/command/defaults/GiveCommand.java
View File

@ -68,7 +68,7 @@ public class GiveCommand extends VanillaCommand {
sender.sendMessage("There's no item called " + args[1]); sender.sendMessage("There's no item called " + args[1]);
} }
} else { } else {
sender.sendMessage("Can't find user " + args[0]); sender.sendMessage("Can't find player " + args[0]);
} }
return true; return true;

3
src/main/java/org/bukkit/command/defaults/ReloadCommand.java
View File

@ -4,6 +4,7 @@ import java.util.Arrays;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class ReloadCommand extends BukkitCommand { public class ReloadCommand extends BukkitCommand {
@ -20,7 +21,7 @@ public class ReloadCommand extends BukkitCommand {
if (!testPermission(sender)) return true; if (!testPermission(sender)) return true;
Bukkit.reload(); Bukkit.reload();
sender.sendMessage(ChatColor.GREEN + "Reload complete."); Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Reload complete.");
return true; return true;
} }

7
src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java
View File

@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -36,7 +37,7 @@ public class SpawnpointCommand extends VanillaCommand {
} else { } else {
player = Bukkit.getPlayerExact(args[0]); player = Bukkit.getPlayerExact(args[0]);
if (player == null) { if (player == null) {
sender.sendMessage("Can't find user " + args[0]); sender.sendMessage("Can't find player " + args[0]);
return true; return true;
} }
} }
@ -51,12 +52,12 @@ public class SpawnpointCommand extends VanillaCommand {
int z = getInteger(sender, args[pos], MIN_COORD, MAX_COORD); int z = getInteger(sender, args[pos], MIN_COORD, MAX_COORD);
player.setBedSpawnLocation(new Location(world, x, y, z), true); player.setBedSpawnLocation(new Location(world, x, y, z), true);
sender.sendMessage("Set " + player.getDisplayName() + "'s spawnpoint to " + x + ", " + y + ", " + z); Command.broadcastCommandMessage(sender, "Set " + player.getDisplayName() + "'s spawnpoint to " + x + ", " + y + ", " + z);
} }
} else if (args.length <= 1) { } else if (args.length <= 1) {
Location location = player.getLocation(); Location location = player.getLocation();
player.setBedSpawnLocation(location, true); player.setBedSpawnLocation(location, true);
sender.sendMessage("Set " + player.getDisplayName() + "'s spawnpoint to " + location.getX() + ", " + location.getY() + ", " + location.getZ()); Command.broadcastCommandMessage(sender, "Set " + player.getDisplayName() + "'s spawnpoint to " + location.getX() + ", " + location.getY() + ", " + location.getZ());
} else { } else {
sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
return false; return false;

2
src/main/java/org/bukkit/command/defaults/TeleportCommand.java
View File

@ -51,7 +51,7 @@ public class TeleportCommand extends VanillaCommand {
if (args.length < 3) { if (args.length < 3) {
Player target = Bukkit.getPlayerExact(args[args.length - 1]); Player target = Bukkit.getPlayerExact(args[args.length - 1]);
if (target == null) { if (target == null) {
sender.sendMessage("Can't find user " + args[args.length - 1] + ". No tp."); sender.sendMessage("Can't find player " + args[args.length - 1] + ". No tp.");
return true; return true;
} }
player.teleport(target, TeleportCause.COMMAND); player.teleport(target, TeleportCause.COMMAND);

1
src/main/java/org/bukkit/command/defaults/TellCommand.java
View File

@ -41,6 +41,7 @@ public class TellCommand extends VanillaCommand {
Bukkit.getLogger().info("[" + sender.getName() + "->" + player.getName() + "] " + message); Bukkit.getLogger().info("[" + sender.getName() + "->" + player.getName() + "] " + message);
} }
sender.sendMessage("[" + sender.getName() + "->" + player.getName() + "] " + message);
player.sendMessage(result); player.sendMessage(result);
} }