Wintergrasp: Fix honor & mark problem + change announcing mode, by Spp. Fixes #14

--HG--
branch : trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index 7498646754d..f400d356568 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -1424,14 +1424,19 @@ void OPvPWintergrasp::EndBattle()
                 (*itr)->ResurrectPlayer(1.0f);
                 ObjectAccessor::Instance().ConvertCorpseForPlayer((*itr)->GetGUID());
             }
-            REMOVE_WARTIME_AURAS(*itr);
             REMOVE_TENACITY_AURA(*itr);
             (*itr)->CombatStop(true);
             (*itr)->getHostilRefManager().deleteReferences();
         }
 
         if (m_timer == 1) // Battle End was forced so no reward.
+        {
+            for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
+            {
+                REMOVE_WARTIME_AURAS(*itr);
+            }
             continue;
+        }
 
         // calculate rewards
         uint32 intactNum = 0;
@@ -1541,6 +1546,7 @@ void OPvPWintergrasp::EndBattle()
                     (*itr)->AreaExploredOrEventHappens(H_VICTORY_IN_WG);
                 }
             }
+            REMOVE_WARTIME_AURAS(*itr);
         }
     }