From 297ce013a841731e83fd8169ba1de65f4419eef0 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 3 Jun 2009 00:24:07 -0500
Subject: *Disable vehicle/creature driver movement when entering vehicle.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/game/Unit.cpp')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 9bef10368d8..dd589023c47 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11655,7 +11655,10 @@ void Unit::RemoveFromWorld()
         ExitVehicle();
 
         if(GetCharmerGUID())
+        {
             sLog.outCrash("Unit %u has charmer guid when removed from world", GetEntry());
+            assert(false);
+        }
 
         WorldObject::RemoveFromWorld();
     }
@@ -11701,7 +11704,7 @@ void Unit::UpdateCharmAI()
         if(isCharmed())
         {
             i_disabledAI = i_AI;
-            if(isPossessed())
+            if(isPossessed() || ((Creature*)this)->isVehicle())
                 i_AI = new PossessedAI((Creature*)this);
             else
                 i_AI = new PetAI((Creature*)this);
@@ -14000,7 +14003,7 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update)
         return;
 
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
-        if((*itr)->GetOwnerGUID() == GetGUID())
+        if((*itr)->GetTypeId() == TYPEID_UNIT)
             (*itr)->SetPhaseMask(newPhaseMask,true);
 
     for(int8 i = 0; i < MAX_SUMMON_SLOT; ++i)
-- 
cgit v1.2.3