Merge branch 'master' of github.com:TrinityCore/TrinityCore

1 files changed, 6 insertions, 4 deletions

diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 99e4d8d7464..085a6f901fd 100755
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -591,7 +591,7 @@ class ObjectMgr
     public:
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
-        typedef std::set<Group *> GroupSet;
+        typedef std::vector<Group *> GroupMap;
 
         typedef std::vector <Guild *> GuildMap;
 
@@ -626,8 +626,10 @@ class ObjectMgr
         void AddGameobjectInfo(GameObjectInfo *goinfo);
 
         Group * GetGroupByGUID(uint32 guid) const;
-        void AddGroup(Group* group) { mGroupSet.insert(group); }
-        void RemoveGroup(Group* group) { mGroupSet.erase(group); }
+        void AddGroup(Group* group);
+        void RemoveGroup(Group* group);
+        uint32 GetNextGroupGuid() { return m_hiGroupGuid; };
+        void SetNextGroupGuid(uint32 nextGuid) { m_hiGroupGuid = nextGuid; };
 
         Guild* GetGuildByLeader(uint64 const&guid) const;
         Guild* GetGuildById(uint32 guildId) const;
@@ -1269,7 +1271,7 @@ class ObjectMgr
         typedef std::set<uint32> TavernAreaTriggerSet;
         typedef std::set<uint32> GameObjectForQuestSet;
 
-        GroupSet            mGroupSet;
+        GroupMap            mGroupMap;
         GuildMap            mGuildMap;
         ArenaTeamMap        mArenaTeamMap;