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

2014-05-11 12:37:29 +02:00
parent dabbe38022 4453cdc5bd
commit 39410b35a4
20 changed files with 3647 additions and 2447 deletions
@@ -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: