Core/Groups: Reuse group guids to stop endless growth

1 files changed, 6 insertions, 0 deletions

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 2f7ae3c4d5f..a118e1c1837 100755
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -635,6 +635,12 @@ void Group::Disband(bool hideDestroy /* = false */)
         CharacterDatabase.CommitTransaction(trans);
         ResetInstances(INSTANCE_RESET_GROUP_DISBAND, false, NULL);
         ResetInstances(INSTANCE_RESET_GROUP_DISBAND, true, NULL);
+
+        // If the deleted group guid is lower than the one we have stored for the next group creation,
+        // use this one instead.
+        if (lowguid < sObjectMgr->GetNextGroupGuid())
+            sObjectMgr->SetNextGroupGuid(lowguid);
+
     }
 
     sObjectMgr->RemoveGroup(this);