aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-05-30 21:23:11 +0200
committerShauren <shauren.trinity@gmail.com>2013-05-30 21:23:11 +0200
commita50eec9439cb5003546a6abe9d8b8a9cb3b5ce4c (patch)
treee9bf473b02b1f25d7380fe11b466de7bb1262db4 /src/server/game
parentadb78862da66b13984c6494befdffbf5da0cdbe6 (diff)
Fixed merge errors
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Battlegrounds/ArenaTeam.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
index e25fbba235b..197e6af68c6 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
@@ -141,6 +141,8 @@ class ArenaTeam
size_t GetMembersSize() const { return Members.size(); }
bool Empty() const { return Members.empty(); }
+ MemberList::iterator m_membersBegin() { return Members.begin(); }
+ MemberList::iterator m_membersEnd() { return Members.end(); }
bool IsMember(uint64 guid) const;
ArenaTeamMember* GetMember(uint64 guid);