Fixed the logic on my last commit

1 files changed, 3 insertions, 2 deletions

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 1dd84a08607..41e0b8e054b 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -133,10 +133,11 @@ void GameObject::AddToWorld()
         sObjectAccessor->AddObject(this);
         bool startOpen = (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? GetGOInfo()->door.startOpen : false);
         bool toggledState = (GetGOData() ? GetGOData()->go_state == GO_STATE_ACTIVE : false);
-        if (m_model/* && (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? !GetGOInfo()->door.startOpen : true)*/)
+        if (m_model)
             GetMap()->Insert(*m_model);
-        if (startOpen || toggledState)
+        if ((startOpen && !toggledState) || (!startOpen && toggledState))
             EnableCollision(false);
+
         WorldObject::AddToWorld();
     }
 }