Add minimum group members getter

cmangos · Oct 30, 2016 · f3e8862 · f3e8862
1 parent 20d9c7e
commit f3e8862
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
@@ -306,7 +306,7 @@ bool Group::AddMember(ObjectGuid guid, const char* name)
 uint32 Group::RemoveMember(ObjectGuid guid, uint8 method)
 {
     // remove member and change leader (if need) only if strong more 2 members _before_ member remove
-    if (GetMembersCount() > uint32(isBGGroup() ? 1 : 2))    // in BG group case allow 1 members group
+    if (GetMembersCount() > GetMembersMinCount())
     {
         bool leaderChanged = _removeMember(guid);
 
@@ -759,7 +759,7 @@ bool Group::_removeMember(ObjectGuid guid)
 
 void Group::_chooseLeader()
 {
-    if (GetMembersCount() < 2)
+    if (GetMembersCount() < GetMembersMinCount())
         return;
 
     ObjectGuid first = ObjectGuid(); // First available: if no suitable canditates are found

diff --git a/src/game/Group.h b/src/game/Group.h
@@ -193,6 +193,7 @@ class MANGOS_DLL_SPEC Group
         GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); }
         GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); }
         uint32 GetMembersCount() const { return m_memberSlots.size(); }
+        uint32 GetMembersMinCount() const { return (isBGGroup() ? 1 : 2); }
         void GetDataForXPAtKill(Unit const* victim, uint32& count, uint32& sum_level, Player*& member_with_max_level, Player*& not_gray_member_with_max_level, Player* additional = nullptr);
         uint8 GetMemberGroup(ObjectGuid guid) const
         {

diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
@@ -467,7 +467,7 @@ void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket& /*recv_data*/)
         return;
 
     /** error handling **/
-    if (!group->IsLeader(GetPlayer()->GetObjectGuid()) || group->GetMembersCount() < 2)
+    if (!group->IsLeader(GetPlayer()->GetObjectGuid()) || group->GetMembersCount() < group->GetMembersMinCount())
         return;
     /********************/