*Merge after backout.

--HG--
branch : trunk

1 files changed, 10 insertions, 1 deletions

diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
index 9b54ecce643..39ef126d9e2 100644
--- a/src/game/BattleGroundEY.cpp
+++ b/src/game/BattleGroundEY.cpp
@@ -128,7 +128,7 @@ void BattleGroundEY::StartingEventOpenDoors()
 
 void BattleGroundEY::AddPoints(uint32 Team, uint32 Points)
 {
-    uint8 team_index = GetTeamIndexByTeamId(Team);
+    BattleGroundTeamId team_index = GetTeamIndexByTeamId(Team);
     m_TeamScores[team_index] += Points;
     m_HonorScoreTics[team_index] += Points;
     if (m_HonorScoreTics[team_index] >= m_HonorTics )
@@ -908,3 +908,12 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player)
     return nearestEntry;
 }
 
+bool BattleGroundEY::IsAllNodesConrolledByTeam(uint32 team) const
+{
+    uint32 count = 0;
+    for(int i = 0; i < EY_POINTS_MAX; ++i)
+        if (m_PointOwnedByTeam[i] == team && m_PointState[i] == EY_POINT_UNDER_CONTROL)
+            ++count;
+
+    return count == EY_POINTS_MAX;
+}