pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix crash when checking Bot Group/Raid membership (#3641)

Browse Source 
* [Bug Fix] Fix crash when checking Bot Group/Raid membership

* Update bot.cpp

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Aeadoin 2023-10-20 18:45:41 -04:00 committed by GitHub
parent 9959070f24
commit 0667fe435f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/bot.cpp
View File

@ -3336,7 +3336,8 @@ bool Bot::Spawn(Client* botCharacterOwner) {
if (auto raid = entity_list.GetRaidByBotName(GetName())) { if (auto raid = entity_list.GetRaidByBotName(GetName())) {
// Safety Check to confirm we have a valid raid // Safety Check to confirm we have a valid raid
if (!raid->IsRaidMember(GetBotOwner()->GetName())) { auto owner = GetBotOwner();
if (owner && !raid->IsRaidMember(owner->GetCleanName())) {
Bot::RemoveBotFromRaid(this); Bot::RemoveBotFromRaid(this);
} else { } else {
SetRaidGrouped(true); SetRaidGrouped(true);
@ -3346,7 +3347,8 @@ bool Bot::Spawn(Client* botCharacterOwner) {
} }
else if (auto group = entity_list.GetGroupByMobName(GetName())) { else if (auto group = entity_list.GetGroupByMobName(GetName())) {
// Safety Check to confirm we have a valid group // Safety Check to confirm we have a valid group
if (!group->IsGroupMember(GetBotOwner()->GetName())) { auto owner = GetBotOwner();
if (owner && !group->IsGroupMember(owner->GetCleanName())) {
Bot::RemoveBotFromGroup(this, group); Bot::RemoveBotFromGroup(this, group);
} else { } else {
SetGrouped(true); SetGrouped(true);