mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-14 16:02:26 +00:00
Post merge fix
This commit is contained in:
parent
cb009aba7c
commit
f2114c7611
@ -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) {
|
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);
|
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;
|
Mob *oos = nullptr;
|
||||||
if(killerMob) {
|
if(killerMob) {
|
||||||
oos = killerMob->GetOwnerOrSelf();
|
oos = killerMob->GetOwnerOrSelf();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user