Merge pull request #5 from PoutineQc/Update

Arena Loading Fix
ChagnonSebastien · May 27, 2016 · 493b15b · 493b15b
2 parents 64c43ac + a7376f8
commit 493b15b
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/Bukkit_1.8/plugin.yml b/Bukkit_1.8/plugin.yml
@@ -1,6 +1,6 @@
 name: CubeRunner
 main : me.poutineqc.cuberunner.CubeRunner
-version: 1.0
+version: 2.0.1
 description: A little minigame to avoid falling blocks
 load: postworld
 author: PoutineQc

diff --git a/Bukkit_1.8/src/me/poutineqc/cuberunner/ArenaData.java b/Bukkit_1.8/src/me/poutineqc/cuberunner/ArenaData.java
@@ -22,7 +22,6 @@ public ArenaData(CubeRunner plugin) {
 				Bukkit.getServer().getLogger().severe(ChatColor.RED + "Could not create arenaData.ylm.");
 			}
 		}
-		loadArenaData();
 	}
 
 	public void loadArenaData() {

diff --git a/Bukkit_1.8/src/me/poutineqc/cuberunner/CubeRunner.java b/Bukkit_1.8/src/me/poutineqc/cuberunner/CubeRunner.java
@@ -2,6 +2,7 @@
 
 import java.util.logging.Logger;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -35,7 +36,7 @@ public class CubeRunner extends JavaPlugin {
 	private JoinGUI joinGui;
 	private ColorGUI colorGUI;
 	private PlayerCommands playerCommands;
-	
+
 	private static Economy economy;
 
 	public void onEnable() {
@@ -62,6 +63,12 @@ public void onEnable() {
 		enableListeners();
 		getCommand("cuberunner").setExecutor(playerCommands);
 
+		Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
+			public void run() {
+				arenaData.loadArenaData();
+			}
+		}, 1L);
+
 		logger.info(pdfFile.getName() + " has been enabled (v" + pdfFile.getVersion() + ")");
 	}
 
@@ -211,7 +218,7 @@ public PlayerCommands getPlayerCommands() {
 	public Achievements getAchievements() {
 		return achievements;
 	}
-	
+
 	public TopManager getTopManager() {
 		return topManager;
 	}

diff --git a/Bukkit_1.8/src/me/poutineqc/cuberunner/commands/PlayerCommands.java b/Bukkit_1.8/src/me/poutineqc/cuberunner/commands/PlayerCommands.java
@@ -334,7 +334,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdValue, Str
 		if (command.getCommandName().equalsIgnoreCase("setcolor")) {
 			if (!Permissions.hasPermission(command, player, true))
 				return true;
-
+				
 			colorGUI.openColorGUI(player, arena);
 			return true;
 		}

diff --git a/Bukkit_1.9/plugin.yml b/Bukkit_1.9/plugin.yml
@@ -1,6 +1,6 @@
 name: CubeRunner
 main : me.poutineqc.cuberunner.CubeRunner
-version: 1.0
+version: 2.0.1
 description: A little minigame to avoid falling blocks
 load: postworld
 author: PoutineQc

diff --git a/Bukkit_1.9/src/me/poutineqc/cuberunner/ArenaData.java b/Bukkit_1.9/src/me/poutineqc/cuberunner/ArenaData.java
@@ -22,7 +22,6 @@ public ArenaData(CubeRunner plugin) {
 				Bukkit.getServer().getLogger().severe(ChatColor.RED + "Could not create arenaData.ylm.");
 			}
 		}
-		loadArenaData();
 	}
 
 	public void loadArenaData() {

diff --git a/Bukkit_1.9/src/me/poutineqc/cuberunner/CubeRunner.java b/Bukkit_1.9/src/me/poutineqc/cuberunner/CubeRunner.java
@@ -2,6 +2,7 @@
 
 import java.util.logging.Logger;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -35,7 +36,7 @@ public class CubeRunner extends JavaPlugin {
 	private JoinGUI joinGui;
 	private ColorGUI colorGUI;
 	private PlayerCommands playerCommands;
-	
+
 	private static Economy economy;
 
 	public void onEnable() {
@@ -62,6 +63,12 @@ public void onEnable() {
 		enableListeners();
 		getCommand("cuberunner").setExecutor(playerCommands);
 
+		Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
+			public void run() {
+				arenaData.loadArenaData();
+			}
+		}, 1L);
+
 		logger.info(pdfFile.getName() + " has been enabled (v" + pdfFile.getVersion() + ")");
 	}
 
@@ -211,7 +218,7 @@ public PlayerCommands getPlayerCommands() {
 	public Achievements getAchievements() {
 		return achievements;
 	}
-	
+
 	public TopManager getTopManager() {
 		return topManager;
 	}

diff --git a/Bukkit_1.9/src/me/poutineqc/cuberunner/achievements/TopManager.java b/Bukkit_1.9/src/me/poutineqc/cuberunner/achievements/TopManager.java
@@ -41,7 +41,6 @@ public void updateAll() {
 
 	private List<TopManager> updateTop(String lookup) {
 		List<TopManager> tempList = new ArrayList<TopManager>();
-
 		if (playerData.getData().contains("players")) {
 			for (String uuid : playerData.getData().getConfigurationSection("players").getKeys(false)) {
 				String name = playerData.getData().getString("players." + uuid + ".name", "unknown");

diff --git a/Bukkit_1.9/src/me/poutineqc/cuberunner/commands/PlayerCommands.java b/Bukkit_1.9/src/me/poutineqc/cuberunner/commands/PlayerCommands.java
@@ -334,7 +334,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdValue, Str
 		if (command.getCommandName().equalsIgnoreCase("setcolor")) {
 			if (!Permissions.hasPermission(command, player, true))
 				return true;
-
+				
 			colorGUI.openColorGUI(player, arena);
 			return true;
 		}

diff --git a/Bukkit_1.9/src/me/poutineqc/cuberunner/games/Arena.java b/Bukkit_1.9/src/me/poutineqc/cuberunner/games/Arena.java
@@ -129,7 +129,7 @@ public static void loadExistingArenas() {
 		} else {
 			if (!arenaData.getData().contains("arenas"))
 				return;
-
+				
 			for (String arenaName : arenaData.getData().getConfigurationSection("arenas").getKeys(false)) {
 				World world = Bukkit.getServer()
 						.getWorld(arenaData.getData().getString("arenas." + arenaName + ".world"));