aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-04-10 20:12:13 -0500
committerSubv <s.v.h21@hotmail.com>2012-04-10 20:12:13 -0500
commita998e9e58a42a1a6ad38fc13da1968c9ee6a4b31 (patch)
treebbf290065cb63007ff73666a059e961d94c91925
parente9ac667cce1e3e12dddf6c1deb3009f841cb486e (diff)
Collision/GameObjects: Corrected a possible logic fail
Signed-off-by: Subv <s.v.h21@hotmail.com>
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index bf1fc6ac706..d96c9052b7a 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -135,7 +135,7 @@ void GameObject::AddToWorld()
sObjectAccessor->AddObject(this);
bool startOpen = (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? GetGOInfo()->door.startOpen : false);
// The state can be changed after GameObject::Create but before GameObject::AddToWorld
- bool toggledState = GetGoState() == GO_STATE_READY;
+ bool toggledState = GetGOData() ? GetGOData()->go_state == GO_STATE_READY : false;
if (m_model)
GetMap()->Insert(*m_model);
if (startOpen ^ toggledState)