pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Spells] Swarm pet aggro logic fix (#1956)

Browse Source 
* temp commit

* swarm pet logic fix

* [Spells] Swarm pet aggro logic fix
This commit is contained in:
KayenEQ
2022-02-03 22:00:52 -05:00
committed by GitHub
parent 4e297f3d96
commit cc0371c16e
4 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+10 -4
View File
@@ -2869,7 +2869,7 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
}
} //MERC
// then add pet owner if there's one
//if I am a pet, then add pet owner if there's one
if (owner) { // Other is a pet, add him and it
// EverHood 6/12/06
// Can't add a feigned owner to hate list
@@ -2884,8 +2884,9 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
!(this->GetSpecialAbility(IMMUNE_AGGRO_CLIENT) && owner->IsClient()) &&
!(this->GetSpecialAbility(IMMUNE_AGGRO_NPC) && owner->IsNPC())
) {
if (owner->IsClient() && !CheckAggro(owner))
if (owner->IsClient() && !CheckAggro(owner)) {
owner->CastToClient()->AddAutoXTarget(this);
}
hate_list.AddEntToHateList(owner, 0, 0, false, !iBuffTic);
}
}
@@ -2912,8 +2913,9 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
}
}
if (other->GetTempPetCount()) {
entity_list.AddTempPetsToHateList(other, this, bFrenzy);
//I have a swarm pet, add other to it.
if (GetTempPetCount()) {
entity_list.AddTempPetsToHateList(this, other, bFrenzy);
}
if (!wasengaged) {
@@ -3697,6 +3699,10 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
}
}
if (GetTempPetCount()) {
entity_list.AddTempPetsToHateListOnOwnerDamage(this, attacker, spell_id);
}
//see if any runes want to reduce this damage
if (spell_id == SPELL_UNKNOWN) {
damage = ReduceDamage(damage);