aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2014-05-17 20:05:43 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2014-05-17 20:05:43 +0200
commit1dbc943297a51bb8979dbc9e33063e98cc0a4a51 (patch)
tree1128ab80a7d1d438059946d394a7fbbc8b24643d /src
parent488e4ef8e1f55aea3ac320390b4526c39ab4bfdb (diff)
Core/GameObjects: fixed instant reset of gameobjects after activation
Diffstat (limited to 'src')
-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 40488df9ef3..306e4209e4d 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1100,7 +1100,7 @@ void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = f
SwitchDoorOrButton(true, alternative);
SetLootState(GO_ACTIVATED, user);
- m_cooldownTime = time(NULL) + time_to_restore;
+ m_cooldownTime = time_to_restore ? (time(NULL) + time_to_restore) : 0;
}
void GameObject::SetGoArtKit(uint8 kit)