mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-11 17:12:25 +00:00
[Bug Fix] Force NPCs to respect special ability 24 and 50 when set on player pets (#2059)
* Force NPCs to respect special ability 24 and 50 when set on player pets * Fix error in logic * Remove this
This commit is contained in:
parent
326dba6aeb
commit
25c0416f1e
@ -436,12 +436,17 @@ bool Mob::CheckWillAggro(Mob *mob) {
|
|||||||
pet_owner->IsClient() &&
|
pet_owner->IsClient() &&
|
||||||
(
|
(
|
||||||
!RuleB(Aggro, AggroPlayerPets) ||
|
!RuleB(Aggro, AggroPlayerPets) ||
|
||||||
pet_owner->CastToClient()->GetGM()
|
pet_owner->CastToClient()->GetGM() ||
|
||||||
|
mob->GetSpecialAbility(IMMUNE_AGGRO)
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IsNPC() && mob->IsNPC() && mob->GetSpecialAbility(IMMUNE_AGGRO_NPC)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check If it's invisible and if we can see invis
|
// Check If it's invisible and if we can see invis
|
||||||
// Check if it's a client, and that the client is connected and not linkdead,
|
// Check if it's a client, and that the client is connected and not linkdead,
|
||||||
// and that the client isn't Playing an NPC, with thier gm flag on
|
// and that the client isn't Playing an NPC, with thier gm flag on
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user