Post merge fix

This commit is contained in:
Akkadius 2014-12-15 01:06:03 -06:00
parent cb009aba7c
commit f2114c7611

View File

@ -1997,6 +1997,9 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillUseTypes attack
bool NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillUseTypes attack_skill) {
mlog(COMBAT__HITS, "Fatal blow dealt by %s with %d damage, spell %d, skill %d", killerMob->GetName(), damage, spell, attack_skill);
bool MadeCorpse = false;
uint16 OrigEntID = this->GetID();
Mob *oos = nullptr;
if(killerMob) {
oos = killerMob->GetOwnerOrSelf();