2 files changed, 28 insertions, 25 deletions

diff --git a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java b/GuessANumber/Controller/src/nl/camilstaps/botleagues/GuessANumberController.java
index eda2f90..411f518 100644
--- a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java
+++ b/GuessANumber/Controller/src/nl/camilstaps/botleagues/GuessANumberController.java
@@ -3,6 +3,7 @@ package nl.camilstaps.botleagues;
 import java.util.List;
 import java.util.Random;
 
+import nl.camilstaps.botleagues.exceptions.TimeOutException;
 import nl.camilstaps.botleagues.roundbasedgame.RoundBasedGameController;
 
 /**
@@ -12,7 +13,7 @@ import nl.camilstaps.botleagues.roundbasedgame.RoundBasedGameController;
  * 
  * @author Camil Staps <info@camilstaps.nl>
  */
-public class MyGameController extends RoundBasedGameController {
+public class GuessANumberController extends RoundBasedGameController {
 	private int numberToGuess;
 
 	/**
@@ -24,7 +25,7 @@ public class MyGameController extends RoundBasedGameController {
 	 */
 	public static void main(String[] args) {
 		@SuppressWarnings("unused")
-		MyGameController game = new MyGameController(args);
+		GuessANumberController game = new GuessANumberController(args);
 	}
 
 	/**
@@ -41,36 +42,36 @@ public class MyGameController extends RoundBasedGameController {
 	 * 
 	 *            Arbitrarily many bots can be added
 	 */
-	public MyGameController(String[] bots) {
+	public GuessANumberController(String[] bots) {
 		addBots(bots);
+		if (getContestants().size() == 0) {
+			System.out.println("Hello");
+			return;
+
+		}
 		setCurrentContestant(getContestants().get(0));
 
 		Random rand = new Random();
 		int n = rand.nextInt(100) + 1;
 		numberToGuess = n;
 
-		run();
+		try {
+			run();
+		} catch (TimeOutException e) {
+			getContestants().remove(getCurrentContestant().getIndex());
+		}
 	}
 
-	/**
-	 * 
-	 * @return next Contestant
-	 */
+
 	@Override
-	public Contestant getNextContestant() {
+	public void setNextContestant() {
 		Contestant currentContestant = getCurrentContestant();
 		List<Contestant> contestants = getContestants();
-		for (int i = 0; i < contestants.size(); i++) {
-			if (contestants.get(i).getUID() == currentContestant.getUID()) {
-				if (contestants.size() != i + 1) {
-					setCurrentContestant(contestants.get(i + 1));
-					return contestants.get(i + 1);
-				} else {
-					return null;
-				}
-			}
+
+		if (contestants.size() != currentContestant.getIndex() + 1) {
+			setCurrentContestant(contestants
+					.get(currentContestant.getIndex() + 1));
 		}
-		return null;
 
 	}
 
@@ -79,13 +80,15 @@ public class MyGameController extends RoundBasedGameController {
 	}
 
 	@Override
-	public MyMove nextTurn(Contestant nextContestant) {
+	public GuessANumberMove nextTurn() throws TimeOutException {
 
-		nextContestant.write("Guess\n");
-		int guess = Integer.parseInt(nextContestant.getLine());
-		MyMove currentMove = new MyMove(guess);
+		getCurrentContestant().write("Guess\n");
+		int guess;
+		guess = Integer.parseInt(getCurrentContestant().getLine(5000));
+		GuessANumberMove currentMove = new GuessANumberMove(guess);
 		return currentMove;
 
 	}
 
+
 }
diff --git a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyMove.java b/GuessANumber/Controller/src/nl/camilstaps/botleagues/GuessANumberMove.java
index b059cf5..95b2270 100644
--- a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyMove.java
+++ b/GuessANumber/Controller/src/nl/camilstaps/botleagues/GuessANumberMove.java
@@ -2,10 +2,10 @@ package nl.camilstaps.botleagues;
 
 import nl.camilstaps.botleagues.roundbasedgame.Move;
 
-public class MyMove extends Move {
+public class GuessANumberMove extends Move {
 	private int guess;
 
-	public MyMove(int guess) {
+	public GuessANumberMove(int guess) {
 		this.guess = guess;
 	}