diff --git a/Dev Builds/Korra.jar b/Dev Builds/Korra.jar index d9560d69..b8d9018f 100644 Binary files a/Dev Builds/Korra.jar and b/Dev Builds/Korra.jar differ diff --git a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java index c51dbda7..a6b8af8a 100644 --- a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java +++ b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java @@ -79,6 +79,7 @@ public enum StockAbilities { public static StockAbilities getAbility(int index) { if (index == -1) return null; - return (StockAbilities)Arrays.asList(values()).get(index); + if (index > 41) return null; + return Arrays.asList(StockAbilities.values()).get(index); } } diff --git a/src/com/projectkorra/ProjectKorra/Commands.java b/src/com/projectkorra/ProjectKorra/Commands.java index 164289ad..d2fac8ce 100644 --- a/src/com/projectkorra/ProjectKorra/Commands.java +++ b/src/com/projectkorra/ProjectKorra/Commands.java @@ -49,6 +49,8 @@ public class Commands { String[] addaliases = {"add", "a"}; String[] whoaliases = {"who", "w"}; String[] importaliases = {"import", "i"}; + + public static boolean debug = ProjectKorra.plugin.getConfig().getBoolean("debug"); private static BukkitTask importTask; private void init() { @@ -266,6 +268,9 @@ public class Commands { final int total = bPlayers.size(); final CommandSender sender = s; s.sendMessage(ChatColor.GREEN + "Import of data started. Do NOT stop / reload your server."); + if (debug) { + s.sendMessage(ChatColor.RED + "Console will print out all of the players that are imported as they import."); + } importTask = Bukkit.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { public void run() { int i = 0; @@ -276,7 +281,7 @@ public class Commands { while (i < 10) { if (bPlayers.isEmpty()) { - sender.sendMessage(ChatColor.GREEN + "Import complete, it may be best to reload your server."); + sender.sendMessage(ChatColor.GREEN + "All data has been queued up, please allow up to 5 minutes for the data to complete, then reboot your server."); Bukkit.getServer().getScheduler().cancelTask(importTask.getTaskId()); for (Player player: Bukkit.getOnlinePlayers()) { Methods.createBendingPlayer(player.getUniqueId(), player.getName()); @@ -310,6 +315,9 @@ public class Commands { // ex.printStackTrace(); // } i++; + if (debug) { + System.out.println("[ProjectKorra] Successfully imported " + bPlayer.player + ". " + bPlayers.size() + " players left to import."); + } } } }, 0, 40); diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index fb136290..166606f0 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -474,6 +474,7 @@ public class ConfigManager { plugin.getConfig().addDefault("Storage.MySQL.db", "minecraft"); plugin.getConfig().addDefault("Storage.MySQL.user", "root"); + config.addDefault("debug", false); plugin.getConfig().options().copyDefaults(true); plugin.saveConfig(); } diff --git a/src/config.yml b/src/config.yml index 1755d089..824172b6 100644 --- a/src/config.yml +++ b/src/config.yml @@ -351,4 +351,5 @@ Storage: port: 3306 pass: '' db: minecraft - user: root \ No newline at end of file + user: root +debug: false \ No newline at end of file diff --git a/src/plugin.yml b/src/plugin.yml index de11010c..977deb8d 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: ProjectKorra author: ProjectKorra -version: 1.2.0 BETA 7 +version: 1.2.0 BETA 8 main: com.projectkorra.ProjectKorra.ProjectKorra commands: projectkorra: