aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorGacko <gacko28@gmx.de>2014-05-11 12:37:29 +0200
committerGacko <gacko28@gmx.de>2014-05-11 12:37:29 +0200
commit39410b35a4ec560bf6626a7bab55e4e0a9aae7e9 (patch)
tree3508b9fbf2d484b5905290a37512f56df2564d00 /src/server/game/Entities/GameObject
parentdabbe38022fddce5778ea7d71915a65dbe9d4b8c (diff)
parent4453cdc5bd3c45551510b203efc6e7a793ba1f06 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rw-r--r--src/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 5efe5a75335..40488df9ef3 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -526,7 +526,7 @@ void GameObject::Update(uint32 diff)
{
case GAMEOBJECT_TYPE_DOOR:
case GAMEOBJECT_TYPE_BUTTON:
- if (GetGOInfo()->GetAutoCloseTime() && (m_cooldownTime < time(NULL)))
+ if (m_cooldownTime && (m_cooldownTime < time(NULL)))
ResetDoorOrButton();
break;
case GAMEOBJECT_TYPE_GOOBER: