reverted the change i made, found specail cases where this cause bugs.

projects/mtg/src/GameObserver.cpp

@@ -81,7 +81,7 @@ void GameObserver::nextGamePhase()
         }
 
     if (cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS)
-        if (BLOCKERS == combatStep)
+        if (BLOCKERS == combatStep || TRIGGERS == combatStep)
         {
             nextCombatStep();
             return;

projects/mtg/src/GuiCombat.cpp

@@ -168,6 +168,7 @@ bool GuiCombat::clickOK()
     {
     case BLOCKERS:
     case TRIGGERS:
+			assert(false);//this is an assert for "do i show the screen that lets you select multiple blocker damage assignment.
         return false; // that should not happen
 
     case ORDER: