From dcce1e2315dee52326d37c46a57fc7fda7ed66ab Mon Sep 17 00:00:00 2001
From: Steffion <stefdegoey@gmail.com>
Date: Thu, 15 Aug 2013 19:06:35 +0200
Subject: [PATCH] * Fix bug arena won't start.

---
 src/nl/Steffion/BlockHunt/Commands/CMDcreate.java | 14 ++++++--------
 src/nl/Steffion/BlockHunt/Commands/CMDreload.java |  1 +
 src/nl/Steffion/BlockHunt/Commands/CMDremove.java |  7 ++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java b/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java
index 0dc8449..4251ad3 100644
--- a/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java
+++ b/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java
@@ -3,8 +3,8 @@ package nl.Steffion.BlockHunt.Commands;
 import java.util.ArrayList;
 
 import nl.Steffion.BlockHunt.Arena;
-import nl.Steffion.BlockHunt.ArenaHandler;
 import nl.Steffion.BlockHunt.W;
+import nl.Steffion.BlockHunt.Arena.ArenaState;
 import nl.Steffion.BlockHunt.Managers.CommandC;
 import nl.Steffion.BlockHunt.Managers.ConfigC;
 import nl.Steffion.BlockHunt.Managers.MessageM;
@@ -33,21 +33,19 @@ public class CMDcreate extends DefaultCMD {
 								.equals(W.pos2.get(player).getWorld())) {
 							Arena arena = new Arena(args[1],
 									W.pos1.get(player), W.pos2.get(player), 12,
-									3, 1, 90, 20, 300,
+									3, 1, 50, 20, 300,
 									new ArrayList<ItemStack>(), null, null,
 									null, new ArrayList<String>(),
 									new ArrayList<String>(),
 									new ArrayList<String>(),
-									new ArrayList<Player>(), null, 0,
+									new ArrayList<Player>(),
+									ArenaState.WAITING, 0,
 									new ArrayList<Player>());
 							W.arenas.getFile().set(args[1], arena);
 							W.arenas.save();
-							W.arenas.load();
 							W.signs.load();
-							for (Arena arena2 : W.arenaList) {
-								ArenaHandler.stopArena(arena2);
-							}
-							ArenaHandler.loadArenas();
+
+							W.arenaList.add((Arena) arena);
 
 							MessageM.sendFMessage(player,
 									ConfigC.normal_createCreatedArena, true,
diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDreload.java b/src/nl/Steffion/BlockHunt/Commands/CMDreload.java
index 6a1e560..40bcf8b 100644
--- a/src/nl/Steffion/BlockHunt/Commands/CMDreload.java
+++ b/src/nl/Steffion/BlockHunt/Commands/CMDreload.java
@@ -24,6 +24,7 @@ public class CMDreload extends DefaultCMD {
 			for (Arena arena : W.arenaList) {
 				ArenaHandler.stopArena(arena);
 			}
+
 			ArenaHandler.loadArenas();
 			W.newFiles();
 			MessageM.sendFMessage(player, ConfigC.normal_reloadedConfigs, true);
diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java
index 5f5a0bc..d1f3127 100644
--- a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java
+++ b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java
@@ -1,7 +1,6 @@
 package nl.Steffion.BlockHunt.Commands;
 
 import nl.Steffion.BlockHunt.Arena;
-import nl.Steffion.BlockHunt.ArenaHandler;
 import nl.Steffion.BlockHunt.W;
 import nl.Steffion.BlockHunt.Managers.CommandC;
 import nl.Steffion.BlockHunt.Managers.ConfigC;
@@ -52,10 +51,8 @@ public class CMDremove extends DefaultCMD {
 
 							W.arenas.save();
 							W.signs.load();
-							for (Arena arena2 : W.arenaList) {
-								ArenaHandler.stopArena(arena2);
-							}
-							ArenaHandler.loadArenas();
+
+							W.arenaList.remove((Arena) arena);
 							return true;
 						}
 					}