From 27c419a8fe8c234ccd2a8d078658e86c36d0a8fd Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 7 May 2011 22:40:02 +0200
Subject: Fixed my silly mistake, thx Machiavelli

---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e73bcda37a1..13a5e4b096a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16198,7 +16198,7 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
     Player *player = NULL;
     if (GetTypeId() == TYPEID_PLAYER)
         player = (Player*)this;
-    else
+    else if (GetCharmer())
     {
         player = GetCharmer()->ToPlayer();
         if (player && player->m_mover != this)
-- 
cgit v1.2.3