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(); }