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

Cleanup IsAttackAllowed checks for bots and their pets

Browse Source
This commit is contained in:
nytmyr
2025-02-02 08:45:06 -06:00
parent b57be45b51
commit 91996f15f0
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/aggro.cpp
+20 -19
View File
@@ -743,28 +743,29 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack)
}
// can't damage own pet (applies to everthing)
Mob *target_owner = target->GetOwner();
Mob *our_owner = GetOwner();
Mob* target_ultimate_owner = (target->IsBot() ? target->CastToBot()->GetBotOwner() : target->GetUltimateOwner());
Mob* our_ultimate_owner = (IsBot() ? CastToBot()->GetBotOwner() : GetUltimateOwner());
Mob* target_owner = target->GetOwner();
Mob* our_owner = GetOwner();
if (target_owner && target_owner == this) {
// Self-owner check
if (target_owner == this || our_owner == target) {
return false;
}
else if (
IsBot() && target_ultimate_owner &&
(
(target_ultimate_owner == our_ultimate_owner) ||
(target_ultimate_owner->IsOfClientBot())
)
) {
return false;
}
else if (our_owner && our_owner == target) {
return false;
}
else if (IsBot() && our_ultimate_owner && our_ultimate_owner == target) {
return false;
// Bot-specific logic
if (IsBot()) {
Mob* target_ultimate_owner = target->IsBot() ? target->CastToBot()->GetBotOwner() : target->GetUltimateOwner();
Mob* our_ultimate_owner = CastToBot()->GetBotOwner();
if (target_ultimate_owner) {
if (target_ultimate_owner == our_ultimate_owner || target_ultimate_owner->IsOfClientBot()) {
return false;
}
}
// Bots should not attack their ultimate owner
if (our_ultimate_owner == target) {
return false;
}
}
// invalidate for swarm pets for later on if their owner is a corpse