From f2114c761173ba4a4c5b25787f8c9c7509f0521d Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 15 Dec 2014 01:06:03 -0600
Subject: [PATCH] Post merge fix

---
 zone/attack.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zone/attack.cpp b/zone/attack.cpp
index 36168efc6..ab1f2a3e7 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -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();