From d9f9ca51272f23677f31130540647caa38dcfa28 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Sun, 18 Nov 2012 17:45:00 -0500 Subject: Add ability to pass 'max' as 'level' for EnchantCommand. --- src/main/java/org/bukkit/command/defaults/EnchantCommand.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/command/defaults/EnchantCommand.java b/src/main/java/org/bukkit/command/defaults/EnchantCommand.java index 45d4a468..29766493 100644 --- a/src/main/java/org/bukkit/command/defaults/EnchantCommand.java +++ b/src/main/java/org/bukkit/command/defaults/EnchantCommand.java @@ -25,7 +25,7 @@ public class EnchantCommand extends VanillaCommand { public EnchantCommand() { 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.usageMessage = "/enchant [level|0] [force]"; + this.usageMessage = "/enchant [level|max|0] [force]"; this.setPermission("bukkit.command.enchant"); } @@ -66,11 +66,10 @@ public class EnchantCommand extends VanillaCommand { int level = 1; if (args.length > 2) { Integer integer = getInteger(args[2]); + int minLevel = enchantment.getStartLevel(); + int maxLevel = force ? Short.MAX_VALUE : enchantment.getMaxLevel(); if (integer != null) { - int minLevel = enchantment.getStartLevel(); - int maxLevel = force ? Short.MAX_VALUE : enchantment.getMaxLevel(); - if (integer == 0) { item.removeEnchantment(enchantment); 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; } + + if ("max".equals(args[2])) { + level = maxLevel; + } } Map enchantments = item.getEnchantments(); -- cgit v1.2.3