Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the /csgive command

This commit is contained in:
Acrobot 2013-10-29 17:12:37 +01:00
parent ac523a1112
commit 1c7c7d926e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/Acrobot/ChestShop/Commands/Give.java
View File

@ -21,13 +21,17 @@ public class Give implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (args.length < 1) {
return false;
}
Player receiver = (sender instanceof Player ? (Player) sender : null);
int quantity = 1;
List<Integer> disregardedIndexes = new ArrayList<Integer>();
if (args.length > 1) {
for (int index = args.length - 1; index > 0; ++index) {
for (int index = args.length - 1; index >= 0; --index) {
Player target = Bukkit.getPlayer(args[index]);
if (target == null) {
@ -39,8 +43,8 @@ public class Give implements CommandExecutor {
break;
}
for (int index = args.length - 1; index > 0; ++index) {
if (!NumberUtil.isInteger(args[index]) && Integer.parseInt(args[index]) > 0) {
for (int index = args.length - 1; index >= 0; --index) {
if (!NumberUtil.isInteger(args[index]) || Integer.parseInt(args[index]) < 0) {
continue;
}
@ -58,7 +62,7 @@ public class Give implements CommandExecutor {
ItemStack item = getItem(args, disregardedIndexes);
if (item == null) {
if (MaterialUtil.isEmpty(item)) {
sender.sendMessage(Messages.prefix(Messages.INCORRECT_ITEM_ID));
return true;
}
@ -68,7 +72,7 @@ public class Give implements CommandExecutor {
sender.sendMessage(Messages.prefix(Messages.ITEM_GIVEN
.replace("%item", MaterialUtil.getName(item))
.replace("player", receiver.getName())));
.replace("%player", receiver.getName())));
return true;
}

2
src/main/resources/plugin.yml
View File

@ -27,7 +27,7 @@ commands:
csGive:
aliases: [give]
description: Gives an item to the appropriate player
usage: /<command> <item code> (player) (amount)
usage: /<command> <item code> (amount) (player)
permission: ChestShop.admin
csVersion:
aliases: [chestshop]