From 734b142879a7dacda136bee0c42eb81a2954b369 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Thu, 28 Mar 2013 00:05:39 +0000 Subject: [PATCH] the fix originally only targeted too many triggers unresolved on the stack, moving the other 2 out of the check as it actually causes new bugs to include them in the skip. --- projects/mtg/src/GameObserver.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 9c274f16c..b7e1e0459 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -591,12 +591,12 @@ void GameObserver::gameStateBasedEffects() //to make sure we are not caught up in a loop, example :Exquisite Blood + Sanguine Bond if (mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0) return; - if (mLayers->actionLayer()->menuObject) - return; - if (getCurrentTargetChooser() || mLayers->actionLayer()->isWaitingForAnswer()) - return; } waitingGameStateCheck = 0; + if (mLayers->actionLayer()->menuObject) + return; + if (getCurrentTargetChooser() || mLayers->actionLayer()->isWaitingForAnswer()) + return; //////////////////////// //---apply damage-----// //after combat effects//