[Bug Fix] Fix Bot/Character ID Overlap in Groups (#4093)

* [Bug Fix] Fix Bot/Character ID Overlap in Groups

- Attempt to fix bot/character ID overlap in groups keeping bots with the same unique identifier as players from not spawning on zone.
- Adds `bot_id` to `group_id` to differentiate bots from characters and hopefully alleviate this issue.

* Update base_group_id_repository.h

* Final push
This commit is contained in:
Alex King
2024-03-23 18:55:03 -04:00
committed by GitHub
parent abdec39cdd
commit 21cec87ac4
19 changed files with 361 additions and 281 deletions
+2 -2
View File
@@ -5377,7 +5377,7 @@ bool Merc::RemoveMercFromGroup(Merc* merc, Group* group) {
{
if(merc->GetMercenaryCharacterID() != 0)
{
database.SetGroupID(merc->GetName(), 0, merc->GetMercenaryCharacterID(), true);
Group::RemoveFromGroup(merc);
}
}
}
@@ -5462,7 +5462,7 @@ bool Merc::MercJoinClientGroup() {
if (AddMercToGroup(this, g))
{
database.SetGroupID(mercOwner->GetName(), g->GetID(), mercOwner->CharacterID(), false);
g->AddToGroup(mercOwner);
database.SetGroupLeaderName(g->GetID(), mercOwner->GetName());
database.RefreshGroupFromDB(mercOwner);
g->SaveGroupLeaderAA();