From 6f154498e0c59baf17967770a9cb886a9029181b Mon Sep 17 00:00:00 2001 From: tobmaps Date: Mon, 2 May 2011 13:36:17 -0400 Subject: 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). --- src/server/game/Entities/GameObject/GameObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3