aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrunningnak3d <runningnak3d@gmail.com>2011-05-02 12:30:05 -0400
committerrunningnak3d <runningnak3d@gmail.com>2011-05-02 12:30:05 -0400
commitf4a29646a59c8e84672c0f1eedcc8fab01883266 (patch)
treeb39ccc91020e319e26679a191199e1bb909eb4fc
parente36e6f328123e310fdd39f44d157dbfd5aabe675 (diff)
Core/GameObject: Fix handling of cooldown for type 6 (trap) GOs. This should fix problems with of trap spamming, like Gift of the Harvester.
-rwxr-xr-xsrc/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 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;