Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-08-17 18:31:41 +02:00
parent 2f5b8ade6c 8257338dc7
commit acfbb61204
8 changed files with 197 additions and 7 deletions
@@ -143,7 +143,12 @@ void GameObject::AddToWorld()
        // The state can be changed after GameObject::Create but before GameObject::AddToWorld
        bool toggledState = GetGoType() == GAMEOBJECT_TYPE_CHEST ? getLootState() == GO_READY : (GetGoState() == GO_STATE_READY || IsTransport());
        if (m_model)
-            GetMap()->InsertGameObjectModel(*m_model);
+        {
+            if (Transport* trans = ToTransport())
+                trans->SetDelayedAddModelToMap();
+            else
+                GetMap()->InsertGameObjectModel(*m_model);
+        }

        EnableCollision(toggledState);
        WorldObject::AddToWorld();