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

Merge pull request #361 from KayenEQ/Development

Browse Source 
Implemented pet type 5 (petTargetLock)
This commit is contained in:
KayenEQ
2015-02-03 07:10:41 -05:00
parent a677d40f6d 356316db84
commit ff8a19b1cb
6 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+6
View File
@@ -1508,6 +1508,9 @@ 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);
@@ -2380,6 +2383,9 @@ 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