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

[Bots] Fix a couple potential crashes with GetNumberNeedingHealedInGroup (#4652)

Browse Source
This commit is contained in:
nytmyr 2025-02-07 13:06:59 -06:00 committed by GitHub
parent 60ba76b39c
commit 05c7e6409d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zone/bot.cpp
View File

@ -7684,15 +7684,15 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
} }
uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range) { uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range) {
if (!tar->IsBot()) { if (!tar) {
return 0; return 0;
} }
uint8 count = 0; uint8 count = 0;
auto target_list = tar->IsClient() ? tar->CastToBot()->GatherSpellTargets() : tar->CastToBot()->GetSpellTargetList(); auto target_list = tar->IsClient() ? GatherSpellTargets(false, tar) : tar->CastToBot()->GetSpellTargetList();
for (Mob* m : target_list) { for (Mob* m : target_list) {
if (tar->CalculateDistance(m) < range && CastChecks(spell_id, m, spell_type, true, IsGroupBotSpellType(spell_type))) { if (m && tar->CalculateDistance(m) < range && CastChecks(spell_id, m, spell_type, true, IsGroupBotSpellType(spell_type))) {
++count; ++count;
} }
} }
@ -11146,11 +11146,14 @@ bool Bot::GetUltimateSpellTypeHold(uint16 spell_type, Mob* tar) {
return GetSpellTypeHold(spell_type); return GetSpellTypeHold(spell_type);
} }
if (tar->IsPet() && tar->GetOwner() && tar->IsPetOwnerBot()) { Mob* owner = tar->IsPet() ? tar->GetOwner() : nullptr;
return tar->GetOwner()->CastToBot()->GetSpellTypeHold(GetPetBotSpellType(spell_type)); Bot* bot_owner = (owner && owner->IsBot())
} ? owner->CastToBot()
: nullptr;
return GetSpellTypeHold(spell_type); return bot_owner
? bot_owner->GetSpellTypeHold(GetPetBotSpellType(spell_type))
: GetSpellTypeHold(spell_type);
} }
void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority) { void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 priority) {

4
zone/botspellsai.cpp
View File

@ -1294,7 +1294,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_ty
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) { for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
// Assuming all the spells have been loaded into this list by level and in descending order // Assuming all the spells have been loaded into this list by level and in descending order
if (IsGroupHealOverTimeSpell(bot_spell_list_itr->SpellId)) { if (IsRegularGroupHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId; uint16 spell_id = bot_spell_list_itr->SpellId;
if (!caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) { if (!caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
@ -1368,7 +1368,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) { for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
// Assuming all the spells have been loaded into this list by level and in descending order // Assuming all the spells have been loaded into this list by level and in descending order
if (IsGroupHealOverTimeSpell(bot_spell_list_itr->SpellId)) { if (IsGroupCompleteHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId; uint16 spell_id = bot_spell_list_itr->SpellId;
if (!caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) { if (!caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {