random strategy

4ban · Nov 29, 2018 · c892b41 · c892b41
1 parent f694982
commit c892b41
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/game/strategies/PlayerStrategies/AiRandomStrategy.java b/src/game/strategies/PlayerStrategies/AiRandomStrategy.java
@@ -234,17 +234,21 @@ protected Void doInBackground() {
                 unSelectCountries(gameState);
                 resetToAndFrom(gameState);
 
-                gameState.setCountryFrom(attackFromList.get(random.nextInt(attackFromList.size())));
+                if(attackFromList.size() > 0) {
+                    gameState.setCountryFrom(attackFromList.get(random.nextInt(attackFromList.size())));
+
+                    List<Country> attackToList = new ArrayList<>();
+                    for (Country country : gameState.getCountryFrom().getNeighbours()) {
+                        if (country.getPlayer() != gameState.getCurrentPlayer()) {
+                            attackToList.add(country);
+                        }
+                    }
 
-                List<Country> attackToList = new ArrayList<>();
-                for (Country country : gameState.getCountryFrom().getNeighbours()){
-                    if (country.getPlayer() != gameState.getCurrentPlayer()){
-                        attackToList.add(country);
+                    if(attackToList.size() > 0) {
+                        gameState.setCountryTo(attackToList.get(random.nextInt(attackToList.size())));
                     }
                 }
 
-                gameState.setCountryTo(attackToList.get(random.nextInt(attackToList.size())));
-
                 if (gameState.getCountryFrom() != null && gameState.getCountryTo() != null) {
                     String message = gameState.getCurrentPlayer().getName() + " attacks from " + gameState.getCountryFrom().getName() + " to " + gameState.getCountryTo().getName();
                     gameState.setCurrentTurnPhraseText(message);