From a8a1b13d492a939ea03f1b3a3f02dd291e1fbed3 Mon Sep 17 00:00:00 2001
From: Dacmot <odragon@videotron.ca>
Date: Mon, 22 May 2017 13:20:27 -0400
Subject: [PATCH] Perform end-of-round in combatExit() and remove
 resetRoundTimers()

---
 .../gpl/rpg/AndorsTrail/controller/CombatController.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 0ece356f8..9e43feb59 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -58,7 +58,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		combatTurnListeners.onCombatEnded();
 		world.model.uiSelections.selectedPosition = null;
 		world.model.uiSelections.selectedMonster = null;
-		controllers.gameRoundController.resetRoundTimers();
+		endOfCombatRound();
 		if (pickupLootBags && totalExpThisFight > 0) {
 			controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight);
 		} else {
@@ -557,6 +557,12 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 	}
 
+	public void endOfCombatRound() {
+		world.model.worldData.tickWorldTime();
+		controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
+		controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true);
+	}
+
 	public void monsterSteppedOnPlayer(Monster m) {
 		setCombatSelection(m);
 		enterCombat(BeginTurnAs.monsters);