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

Correct pet checks on GetUltimateSpell functions

Browse Source
This commit is contained in:
nytmyr
2025-01-31 15:27:25 -06:00
parent 2211e125d8
commit 09bbe87268
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+17 -7
View File
@@ -10553,11 +10553,13 @@ void Bot::SetBotSpellRecastTimer(uint16 spell_type, Mob* tar, bool precast) {
} }
if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) { if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) {
if (tar->IsClient()) { Mob* owner = tar->GetOwner();
tar->GetOwner()->CastToClient()->SetSpellTypeRecastTimer(spell_type, (GetUltimateSpellDelay(spell_type, tar) + added_delay));
if (owner->IsClient()) {
owner->CastToClient()->SetSpellTypeRecastTimer(spell_type, (GetUltimateSpellDelay(spell_type, tar) + added_delay));
} }
else { else {
tar->GetOwner()->CastToBot()->SetSpellTypeRecastTimer(spell_type, (GetUltimateSpellDelay(spell_type, tar) + added_delay)); owner->CastToBot()->SetSpellTypeRecastTimer(spell_type, (GetUltimateSpellDelay(spell_type, tar) + added_delay));
} }
} }
else if (IsBotSpellTypeOtherBeneficial(spell_type)) { else if (IsBotSpellTypeOtherBeneficial(spell_type)) {
@@ -13088,7 +13090,9 @@ uint16 Bot::GetUltimateSpellDelay(uint16 spell_type, Mob* tar) {
} }
if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) { if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) {
return tar->IsClient() ? tar->GetOwner()->CastToClient()->GetSpellDelay(GetPetBotSpellType(spell_type)) : tar->GetOwner()->CastToBot()->GetSpellDelay(GetPetBotSpellType(spell_type)); Mob* owner = tar->GetOwner();
return owner->IsClient() ? owner->CastToClient()->GetSpellDelay(GetPetBotSpellType(spell_type)) : owner->CastToBot()->GetSpellDelay(GetPetBotSpellType(spell_type));
} }
if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) { if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) {
@@ -13104,7 +13108,9 @@ bool Bot::GetUltimateSpellDelayCheck(uint16 spell_type, Mob* tar) {
} }
if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) { if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) {
return tar->IsClient() ? tar->GetOwner()->CastToClient()->SpellTypeRecastCheck(GetPetBotSpellType(spell_type)) : tar->GetOwner()->CastToBot()->SpellTypeRecastCheck(GetPetBotSpellType(spell_type)); Mob* owner = tar->GetOwner();
return owner->IsClient() ? owner->CastToClient()->SpellTypeRecastCheck(GetPetBotSpellType(spell_type)) : owner->CastToBot()->SpellTypeRecastCheck(GetPetBotSpellType(spell_type));
} }
if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) { if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) {
@@ -13120,7 +13126,9 @@ uint8 Bot::GetUltimateSpellMinThreshold(uint16 spell_type, Mob* tar) {
} }
if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) { if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) {
return tar->IsClient() ? tar->GetOwner()->CastToClient()->GetSpellMinThreshold(GetPetBotSpellType(spell_type)) : tar->GetOwner()->CastToBot()->GetSpellMinThreshold(GetPetBotSpellType(spell_type)); Mob* owner = tar->GetOwner();
return owner->IsClient() ? owner->CastToClient()->GetSpellMinThreshold(GetPetBotSpellType(spell_type)) : owner->CastToBot()->GetSpellMinThreshold(GetPetBotSpellType(spell_type));
} }
if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) { if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) {
@@ -13136,7 +13144,9 @@ uint8 Bot::GetUltimateSpellMaxThreshold(uint16 spell_type, Mob* tar) {
} }
if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) { if (tar->IsPet() && tar->GetOwner() && tar->GetOwner()->IsOfClientBot()) {
return tar->IsClient() ? tar->GetOwner()->CastToClient()->GetSpellMaxThreshold(GetPetBotSpellType(spell_type)) : tar->GetOwner()->CastToBot()->GetSpellMaxThreshold(GetPetBotSpellType(spell_type)); Mob* owner = tar->GetOwner();
return owner->IsClient() ? owner->CastToClient()->GetSpellMaxThreshold(GetPetBotSpellType(spell_type)) : owner->CastToBot()->GetSpellMaxThreshold(GetPetBotSpellType(spell_type));
} }
if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) { if (IsBotSpellTypeOtherBeneficial(spell_type) && tar->IsOfClientBot()) {