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

Merge pull request #362 from KayenEQ/Development

Browse Source 
Improvements to the pet type (5) code.
This commit is contained in:
KayenEQ
2015-02-03 08:01:15 -05:00
parent ff8a19b1cb 33767aeb91
commit bfa6bd3458
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
-6
View File
@@ -1508,9 +1508,6 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillUseTypes att
}
}
}
if (killerMob && killerMob->IsPet() && killerMob->GetPetType() == petTargetLock && killerMob->GetID() != GetID())
killerMob->Kill();
}
entity_list.RemoveFromTargets(this);
@@ -2383,9 +2380,6 @@ bool NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillUseTypes attack
}
}
if (killerMob && killerMob->IsPet() && killerMob->GetPetType() == petTargetLock && killerMob->GetID() != GetID())
killerMob->Kill();
WipeHateList();
p_depop = true;
if(killerMob && killerMob->GetTarget() == this) //we can kill things without having them targeted