mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-11 03:31:08 +00:00
[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:
@@ -1092,7 +1092,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
|
||||
break;
|
||||
}
|
||||
|
||||
database.SetGroupID(Inviter->GetName(), group->GetID(), Inviter->CastToClient()->CharacterID(), false);
|
||||
group->AddToGroup(Inviter);
|
||||
database.SetGroupLeaderName(group->GetID(), Inviter->GetName());
|
||||
group->UpdateGroupAAs();
|
||||
|
||||
@@ -1192,9 +1192,11 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
|
||||
group->UpdatePlayer(client);
|
||||
else
|
||||
{
|
||||
if (client->GetMerc())
|
||||
database.SetGroupID(client->GetMerc()->GetCleanName(), 0, client->CharacterID(), true);
|
||||
database.SetGroupID(client->GetName(), 0, client->CharacterID(), false); //cannot re-establish group, kill it
|
||||
if (client->GetMerc()) {
|
||||
Group::RemoveFromGroup(client->GetMerc());
|
||||
}
|
||||
|
||||
Group::RemoveFromGroup(client); //cannot re-establish group, kill it
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user