aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
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)