pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 20:08:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bot Death fixed and few other crashes

Browse Source
This commit is contained in:
neckkola
2022-01-21 23:31:59 -04:00
parent 4215a47d82
commit 5a9c8c18c1
7 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+25 -2
View File
@@ -4049,7 +4049,13 @@ bool Bot::Spawn(Client* botCharacterOwner) {
this->SendWearChange(materialFromSlot);
}
}
Raid* raid = entity_list.GetRaidByBotName(this->GetName());
if (raid)
{
raid->VerifyRaid();
this->SetRaidGrouped(true);
}
return true;
}
@@ -5028,8 +5034,23 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQ::skills::Skill
if ((GetPullingFlag() || GetReturningFlag()) && my_owner && my_owner->IsClient()) {
my_owner->CastToClient()->SetBotPulling(false);
}
if (!this->IsRaidGrouped())
Raid* raid = entity_list.GetRaidByBotName(this->GetName());
uint32 gid = raid->GetGroup(this->GetName());
if (raid)
{
for (int x = 0; x < MAX_RAID_MEMBERS; x++)
{
if (strcmp(raid->members[x].membername, this->GetName()) == 0)
{
raid->members[x].member = nullptr;
}
}
}
else
{
entity_list.RemoveBot(this->GetID());
}
return true;
}
@@ -9294,8 +9315,10 @@ bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, fl
break;
}
Group* g = caster->GetGroup();
uint32 gid = 0xff;
Raid* raid = entity_list.GetRaidByBotName(caster->GetName());
uint32 gid = raid->GetGroup(caster->GetName());
if (raid)
uint32 gid = raid->GetGroup(caster->GetName());
if(g) {
for(int i = 0; i < MAX_GROUP_MEMBERS; i++) {