diff options
author | tobmaps <tobmaps@trinitycore.org> | 2011-05-02 13:36:17 -0400 |
---|---|---|
committer | runningnak3d <runningnak3d@gmail.com> | 2011-05-02 13:36:17 -0400 |
commit | 6f154498e0c59baf17967770a9cb886a9029181b (patch) | |
tree | f01549c89b8f71fea62ca05e1eec61e93ccfa1c9 | |
parent | f4a29646a59c8e84672c0f1eedcc8fab01883266 (diff) |
Core/Gameobject: Fix default cooldown on traps with no cooldown. Should stop you from stepping in camp fires and getting Spam(c) fried. (I prefer steak, thank you).
-rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 2 |
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 3f9c3fbfa27..2cd9f7140ad 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -451,7 +451,7 @@ void GameObject::Update(uint32 diff) if (goInfo->trap.spellId) CastSpell(ok, goInfo->trap.spellId); - m_cooldownTime = time(NULL) + goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4); // template or 4 seconds + m_cooldownTime = time(NULL) + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4)); // template or 4 seconds if (goInfo->trap.type == 1) SetLootState(GO_JUST_DEACTIVATED); |