diff options
| -rw-r--r-- | GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java b/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java index bf83786..eda2f90 100644 --- a/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java +++ b/GuessANumber/Controller/src/nl/camilstaps/botleagues/MyGameController.java @@ -60,18 +60,15 @@ public class MyGameController extends RoundBasedGameController { public Contestant getNextContestant() { Contestant currentContestant = getCurrentContestant(); List<Contestant> contestants = getContestants(); - if (currentContestant == null) { - Random rand = new Random(); - int n = rand.nextInt(contestants.size()); - currentContestant = contestants.get(n); - return contestants.get(n + 1); - } for (int i = 0; i < contestants.size(); i++) { - if (contestants.get(i).getUID() == currentContestant.getUID()) - if (contestants.size() != i + 1) + if (contestants.get(i).getUID() == currentContestant.getUID()) { + if (contestants.size() != i + 1) { + setCurrentContestant(contestants.get(i + 1)); return contestants.get(i + 1); - else + } else { return null; + } + } } return null; |