aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-10-06 17:01:29 +0100
committerNay <dnpd.dd@gmail.com>2012-10-06 17:01:29 +0100
commitd641775a1f102681c134e6de4507cd1a13289ab3 (patch)
tree5ec6ac6f79ea2aa16ccc12b29eaed60d89fe8668 /src/server/game/Entities/GameObject
parentd27a3955f05427762f1d3bce71b07b682bfc36b1 (diff)
Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion
startDelay is 1 for all hunter traps Fix non PCH build (boss_elder_madox.cpp) Remove a double parentheses in LFGGroupScript
Diffstat (limited to 'src/server/game/Entities/GameObject')
-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 6a6c3cb16b4..da6e4ef8407 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -293,7 +293,7 @@ void GameObject::Update(uint32 diff)
else if (Unit* owner = GetOwner())
{
if (owner->isInCombat())
- m_cooldownTime = time(NULL) + 1;
+ m_cooldownTime = time(NULL) + goInfo->trap.startDelay;
}
m_lootState = GO_READY;
break;