aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-05-07 22:40:02 +0200
committerShauren <shauren.trinity@gmail.com>2011-05-07 22:40:02 +0200
commit27c419a8fe8c234ccd2a8d078658e86c36d0a8fd (patch)
tree9b12f113d1f7b6ef7c2c3f9a9ea551612c2da45c /src
parent8cc4125664488c85be3d92b76415debd1a78d8db (diff)
Fixed my silly mistake, thx Machiavelli
Diffstat (limited to 'src')
-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)