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

Use PetCommands SPA instead of GetAA

Browse Source
This commit is contained in:
Michael Cook (mackal)
2017-05-04 17:48:32 -04:00
parent 04cf511e4f
commit 84bcb3ac03
5 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+2 -2
View File
@@ -2522,7 +2522,7 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
// we skip these checks if it's forced through a pet command
if (!pet_command) {
if (IsPet() && GetOwner() && GetOwner()->GetAA(aaPetDiscipline)) {
if (IsPet()) {
if ((IsGHeld() || (IsHeld() && IsFocused())) && !on_hatelist) // we want them to be able to climb the hate list
return;
if (IsHeld() && !wasengaged)
@@ -2632,7 +2632,7 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
}
}
if (mypet && (!(GetAA(aaPetDiscipline) && mypet->IsHeld()))) { // I have a pet, add other to it
if (mypet && !mypet->IsHeld()) { // I have a pet, add other to it
if (!mypet->IsFamiliar() && !mypet->GetSpecialAbility(IMMUNE_AGGRO))
mypet->hate_list.AddEntToHateList(other, 0, 0, bFrenzy);
}