Finished some todos

WindSpigot-API/src/main/java/org/bukkit/command/defaults/EnchantCommand.java

@@ -98,7 +98,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
 						Map<Enchantment, Integer> enchantments = item.getEnchantments();
 						boolean conflicts = false;
 
-						if (!force && !enchantments.isEmpty()) { // TODO: Improve this to use a "hasEnchantments" call
+						if (!force && !item.hasEnchantments()) {
 							for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet()) {
 								Enchantment enchant = entry.getKey();
 

WindSpigot-API/src/main/java/org/bukkit/command/defaults/VanillaCommand.java

@@ -82,11 +82,10 @@ public static double getDouble(CommandSender sender, String input) {
 	public static double getDouble(CommandSender sender, String input, double min, double max) {
 		double result = getDouble(sender, input);
 
-		// TODO: This should throw an exception instead.
 		if (result < min) {
-			result = min;
+			throw new NumberFormatException(String.format("Number must be at least %s", min));
 		} else if (result > max) {
-			result = max;
+			throw new NumberFormatException(String.format("Number must be at most %s", max));
 		}
 
 		return result;

WindSpigot-API/src/main/java/org/bukkit/inventory/ItemStack.java

@@ -404,6 +404,17 @@ public Map<Enchantment, Integer> getEnchantments() {
 		return meta == null ? ImmutableMap.<Enchantment, Integer>of() : meta.getEnchants();
 	}
 
+	// WindSpigot start
+	/**
+	 * Checks if this ItemStack has any enchantments.
+	 *
+	 * @return True if this has any enchantments
+	 */
+	public boolean hasEnchantments() {
+		return !getEnchantments().isEmpty();
+	}
+	// WindSpigot stop
+
 	/**
 	 * Adds the specified enchantments to this item stack.
 	 * <p>

WindSpigot-Server/src/main/java/com/windpvp/windspigot/WindSpigot.java

@@ -85,19 +85,22 @@ private void initCmds() {
 			PingCommand pingCommand = new PingCommand("ping");
 			commandMap.register(pingCommand.getName(), "", pingCommand);
 		}
-
-
 
 		// NachoSpigot commands
-		// TODO: add configuration for all of these
-		SetMaxSlotCommand setMaxSlotCommand = new SetMaxSlotCommand("sms"); // [Nacho-0021] Add setMaxPlayers within Bukkit.getServer() and SetMaxSlot Command
-		commandMap.register(setMaxSlotCommand.getName(), "ns", setMaxSlotCommand);
+		if (WindSpigotConfig.setMaxSlotCommand) {
+			SetMaxSlotCommand setMaxSlotCommand = new SetMaxSlotCommand("sms"); // [Nacho-0021] Add setMaxPlayers within Bukkit.getServer() and SetMaxSlot Command
+			commandMap.register(setMaxSlotCommand.getName(), "ns", setMaxSlotCommand);
+		}
 
-		SpawnMobCommand spawnMobCommand = new SpawnMobCommand("spawnmob");
-		commandMap.register(spawnMobCommand.getName(), "ns", spawnMobCommand);
+		if (WindSpigotConfig.spawnMobCommand) {
+			SpawnMobCommand spawnMobCommand = new SpawnMobCommand("spawnmob");
+			commandMap.register(spawnMobCommand.getName(), "ns", spawnMobCommand);
+		}
 
-		KnockbackCommand knockbackCommand = new KnockbackCommand("kb");
-		commandMap.register(knockbackCommand.getName(), "ns", knockbackCommand);
+		if (WindSpigotConfig.knockbackCommand) {
+			KnockbackCommand knockbackCommand = new KnockbackCommand("kb");
+			commandMap.register(knockbackCommand.getName(), "ns", knockbackCommand);
+		}
 	}
 
 	private void initStatistics() {

WindSpigot-Server/src/main/java/com/windpvp/windspigot/config/WindSpigotConfig.java

@@ -161,6 +161,9 @@ static void loadComments() {
 
 		// NachoSpigot stuff
 		c.addComment("settings.save-empty-scoreboard-teams", "Toggles whether or not the server should save empty scoreboard teams");
+		c.addComment("settings.command.setmaxslot", "Enables the /setmaxslot command");
+		c.addComment("settings.command.spawnmob", "Enables the /spawnmob command");
+		c.addComment("settings.command.knockback", "Enables the /knockback command");
 		c.addComment("settings.command.version", "Enables the /version command");
 		c.addComment("settings.command.plugins", "Enables the /plugins command");
 		c.addComment("settings.command.reload", "Enables the /reload command (It is recommended to not use /reload)");
@@ -438,11 +441,17 @@ private static void saveEmptyScoreboardTeams() {
 		saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
 	}
 
+	public static boolean setMaxSlotCommand;
+	public static boolean spawnMobCommand;
+	public static boolean knockbackCommand;
 	public static boolean enableVersionCommand;
 	public static boolean enablePluginsCommand;
 	public static boolean enableReloadCommand;
 
 	private static void commands() {
+		setMaxSlotCommand = getBoolean("settings.command.setmaxslot", true);
+		spawnMobCommand = getBoolean("settings.command.spawnmob", true);
+		knockbackCommand = getBoolean("settings.command.knockback", true);
 		enableVersionCommand = getBoolean("settings.command.version", true);
 		enablePluginsCommand = getBoolean("settings.command.plugins", true);
 		enableReloadCommand = getBoolean("settings.command.reload", false);