*Try to fix crash.

--HG--
branch : trunk

1 files changed, 1 insertions, 5 deletions

diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index e5f45722eba..377b1d263b2 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -31,8 +31,6 @@ Vehicle::Vehicle() : Creature(), m_vehicleId(0)
 
 Vehicle::~Vehicle()
 {
-    if(m_uint32Values)                                      // only for fully created Object
-        ObjectAccessor::Instance().RemoveObject(this);
 }
 
 void Vehicle::AddToWorld()
@@ -41,6 +39,7 @@ void Vehicle::AddToWorld()
     {
         ObjectAccessor::Instance().AddObject(this);
         Unit::AddToWorld();
+        AIM_Initialize();
     }
 }
 
@@ -79,8 +78,6 @@ bool Vehicle::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, u
 
     m_defaultMovementType = IDLE_MOTION_TYPE;
 
-    AIM_Initialize();
-
     SetVehicleId(vehicleId);
 
     SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
@@ -173,6 +170,5 @@ bool Vehicle::LoadFromDB(uint32 guid, Map *map)
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
 
-    AIM_Initialize();
     return true;
 }