Replace some assert with return statement, fixed some crash bugs

--HG--
branch : trunk

1 files changed, 5 insertions, 2 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 4b9d8f47dc7..935bd136724 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4481,7 +4481,9 @@ GameObject* Unit::GetGameObject(uint32 spellId) const
 
 void Unit::AddGameObject(GameObject* gameObj)
 {
-    assert(gameObj && gameObj->GetOwnerGUID()==0);
+    if(!gameObj || !gameObj->GetOwnerGUID()==0)
+       return;
+
     m_gameObj.push_back(gameObj);
     gameObj->SetOwnerGUID(GetGUID());
 
@@ -4497,7 +4499,8 @@ void Unit::AddGameObject(GameObject* gameObj)
 
 void Unit::RemoveGameObject(GameObject* gameObj, bool del)
 {
-    assert(gameObj && gameObj->GetOwnerGUID()==GetGUID());
+    if(!gameObj || !gameObj->GetOwnerGUID()==GetGUID())
+       return;
 
     gameObj->SetOwnerGUID(0);