From e1cfdaedcf26546c7732d1de4e30da3d519e4fd8 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 6 Aug 2009 11:32:56 -0500
Subject: *Remove the assert(false) in StopCastingCharm() because i am not able
 to fix it for now.

--HG--
branch : trunk
---
 src/game/Player.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index a49d6ac6d77..af45bbc6eb3 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16933,8 +16933,13 @@ void Player::StopCastingCharm()
     if(GetCharmGUID())
     {
         sLog.outCrash("Player %s (GUID: " UI64FMTD " is not able to uncharm unit (GUID: " UI64FMTD " Entry: %u, Type: %u)", GetName(), GetGUID(), GetCharmGUID(), charm->GetEntry(), charm->GetTypeId());
-        sLog.outCrash("Charmed unit has charmer guid " UI64FMTD, charm->GetCharmerGUID());
-        assert(false);
+        if(charm->GetCharmerGUID())
+        {
+            sLog.outCrash("Charmed unit has charmer guid " UI64FMTD, charm->GetCharmerGUID());
+            assert(false);
+        }
+        else
+            SetCharm(charm, false);
     }
 }
 
-- 
cgit v1.2.3