From 394dbf0cdceea425a1ad63ecebc614e29728d365 Mon Sep 17 00:00:00 2001
From: kaelima <kaelima@live.se>
Date: Fri, 2 Mar 2012 12:23:16 +0100
Subject: Core/Misc: Fix a crash in CalendarMgr::AddAction and initialize some
 wild pointers.

---
 src/server/game/Entities/Unit/Unit.cpp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/server/game/Entities/Unit')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 138eda962aa..dbbb8acf759 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -784,20 +784,9 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam
         // last damage from duel opponent
         if (duel_hasEnded)
         {
-            Player* he;
+            Player* he = duel_wasMounted ? victim->GetCharmer()->ToPlayer() : victim->ToPlayer();
 
-            if (duel_wasMounted)
-            {
-                ASSERT(victim->GetCharmer()->GetTypeId() == TYPEID_PLAYER);
-                he = victim->GetCharmer()->ToPlayer();
-            }
-            else
-            {
-                ASSERT(victim->GetTypeId() == TYPEID_PLAYER);
-                he = victim->ToPlayer();
-            }
-
-            ASSERT(he->duel);
+            ASSERT(he && he->duel);
 
             if (duel_wasMounted) // In this case victim==mount
                 victim->SetHealth(1);
-- 
cgit v1.2.3