From 0457d98405879207c3b7b28618782fee8673f29e Mon Sep 17 00:00:00 2001
From: Spp- <u84280@epreinf21.(none)>
Date: Mon, 1 Aug 2011 13:44:54 +0200
Subject: [PATCH] Core/Movement: Crash fix

---
 src/server/game/Movement/MotionMaster.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 2a15eb5845..ec928e74a3 100755
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -77,9 +77,14 @@ MotionMaster::~MotionMaster()
 
 void MotionMaster::UpdateMotion(uint32 diff)
 {
+    if (!i_owner)
+        return;
+
     if (i_owner->HasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED)) // what about UNIT_STAT_DISTRACTED? Why is this not included?
         return;
+
     ASSERT(!empty());
+
     m_cleanFlag |= MMCF_UPDATE;
     if (!top()->Update(*i_owner, diff))
     {