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

Add ability to pass 'max' as 'level' for EnchantCommand.

Browse Source
This commit is contained in:
EvilSeph 2012-11-18 17:45:00 -05:00
parent 321aea4156
commit d9f9ca5127
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/bukkit/command/defaults/EnchantCommand.java
View File

@ -25,7 +25,7 @@ public class EnchantCommand extends VanillaCommand {
public EnchantCommand() { public EnchantCommand() {
super("enchant"); super("enchant");
this.description = "Adds enchantments to the item the player is currently holding. Specify 0 for the level to remove an enchantment. Specify force to ignore normal enchantment restrictions"; this.description = "Adds enchantments to the item the player is currently holding. Specify 0 for the level to remove an enchantment. Specify force to ignore normal enchantment restrictions";
this.usageMessage = "/enchant <player> <enchantment> [level|0] [force]"; this.usageMessage = "/enchant <player> <enchantment> [level|max|0] [force]";
this.setPermission("bukkit.command.enchant"); this.setPermission("bukkit.command.enchant");
} }
@ -66,11 +66,10 @@ public class EnchantCommand extends VanillaCommand {
int level = 1; int level = 1;
if (args.length > 2) { if (args.length > 2) {
Integer integer = getInteger(args[2]); Integer integer = getInteger(args[2]);
int minLevel = enchantment.getStartLevel();
int maxLevel = force ? Short.MAX_VALUE : enchantment.getMaxLevel();
if (integer != null) { if (integer != null) {
int minLevel = enchantment.getStartLevel();
int maxLevel = force ? Short.MAX_VALUE : enchantment.getMaxLevel();
if (integer == 0) { if (integer == 0) {
item.removeEnchantment(enchantment); item.removeEnchantment(enchantment);
Command.broadcastCommandMessage(sender, String.format("Removed %s on %s's %s", enchantmentName, player.getName(), itemName)); Command.broadcastCommandMessage(sender, String.format("Removed %s on %s's %s", enchantmentName, player.getName(), itemName));
@ -85,6 +84,10 @@ public class EnchantCommand extends VanillaCommand {
level = integer; level = integer;
} }
if ("max".equals(args[2])) {
level = maxLevel;
}
} }
Map<Enchantment, Integer> enchantments = item.getEnchantments(); Map<Enchantment, Integer> enchantments = item.getEnchantments();