From f4a29646a59c8e84672c0f1eedcc8fab01883266 Mon Sep 17 00:00:00 2001
From: runningnak3d <runningnak3d@gmail.com>
Date: Mon, 2 May 2011 12:30:05 -0400
Subject: Core/GameObject: Fix handling of cooldown for type 6 (trap) GOs. This
 should fix problems with of trap spamming, like Gift of the Harvester.

---
 src/server/game/Entities/GameObject/GameObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index af7fe560d9d..3f9c3fbfa27 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -283,7 +283,7 @@ void GameObject::Update(uint32 diff)
                     else if (Unit* owner = GetOwner())
                     {
                         if (owner->isInCombat())
-                            m_cooldownTime = time(NULL) + goInfo->trap.startDelay;
+                            m_cooldownTime = time(NULL) + goInfo->trap.cooldown;
                     }
                     m_lootState = GO_READY;
                     break;
-- 
cgit v1.2.3