From 048ea6b3561e9c23ea09fc66b56a5a9c79e27ede Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Wed, 12 Jun 2013 01:25:11 +0200
Subject: [PATCH] Do not wait for combat turns when monsters want to move, but
 cannot find a path.

---
 .../rpg/AndorsTrail/controller/CombatController.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 94e4026d0..9099b617c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -359,10 +359,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	
 	private void moveCurrentMonster() {
 		controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getMoveCost());
-		if (controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) {
-			controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap);
-            combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
+		if (!controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) {
+			// Couldn't find a path to move on.
+			handleNextMonsterAction();
+			return;
 		}
+
+		controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap);
+        combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
 		waitForNextMonsterAction();
 	}