Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

2 files changed, 6 insertions, 3 deletions

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 040bd8b70dd..41e0b8e054b 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -132,10 +132,12 @@ void GameObject::AddToWorld()
 
         sObjectAccessor->AddObject(this);
         bool startOpen = (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? GetGOInfo()->door.startOpen : false);
-        if (m_model/* && (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? !GetGOInfo()->door.startOpen : true)*/)
+        bool toggledState = (GetGOData() ? GetGOData()->go_state == GO_STATE_ACTIVE : false);
+        if (m_model)
             GetMap()->Insert(*m_model);
-        if (startOpen)
+        if ((startOpen && !toggledState) || (!startOpen && toggledState))
             EnableCollision(false);
+
         WorldObject::AddToWorld();
     }
 }
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 117c594b41a..ac28e1ff086 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -37,7 +37,8 @@ bool Model::open()
     if (!ok)
     {
         f.close();
-        printf("Error loading model %s\n", filename.c_str());
+        // Do not show this error on console to avoid confusion, the extractor can continue working even if some models fail to load
+        //printf("Error loading model %s\n", filename.c_str());
         return false;
     }