Update Bukkit for 1.3.1 changes

This commit is contained in:
feildmaster
2012-07-29 02:34:09 -05:00
committed by Travis Watkins
parent 6a53010c0c
commit 110ad8c196
31 changed files with 416 additions and 149 deletions

View File

@@ -2,7 +2,6 @@ package org.bukkit.command.defaults;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -10,32 +9,31 @@ public class ExpCommand extends VanillaCommand {
public ExpCommand() {
super("xp");
this.description = "Gives the specified player a certain amount of experience";
this.usageMessage = "/xp <player> <amount>";
this.usageMessage = "/xp <amount> [player]";
this.setPermission("bukkit.command.xp");
}
@Override
public boolean execute(CommandSender sender, String currentAlias, String[] args) {
if (!testPermission(sender)) return true;
if (args.length != 2) {
if (args.length < 1) {
sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
return false;
}
int exp = getInteger(sender, args[0], 0, 5000);
Player player = null;
Player player = Bukkit.getPlayerExact(args[0]);
if (args.length > 1) {
player = Bukkit.getPlayer(args[1]);
} else if (sender instanceof Player) {
player = (Player) sender;
}
if (player != null) {
try {
int exp = Integer.parseInt(args[1]);
Command.broadcastCommandMessage(sender, "Giving " + exp + " exp to " + player.getName());
player.giveExp(exp);
} catch (NumberFormatException ex) {
sender.sendMessage("Invalid exp count: " + args[1]);
}
player.giveExp(exp);
sender.sendMessage("Giving " + exp + " exp to " + player.getName());
} else {
sender.sendMessage("Can't find user " + args[0]);
sender.sendMessage("Can't find user, was one provided?\n" + ChatColor.RED + "Usage: " + usageMessage);
}
return true;