diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-10-06 17:01:29 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-10-06 17:01:29 +0100 |
| commit | d641775a1f102681c134e6de4507cd1a13289ab3 (patch) | |
| tree | 5ec6ac6f79ea2aa16ccc12b29eaed60d89fe8668 /src | |
| parent | d27a3955f05427762f1d3bce71b07b682bfc36b1 (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')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGScripts.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 5a3962cc04d..36f04b3020b 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -123,7 +123,7 @@ void LFGGroupScript::OnRemoveMember(Group* group, uint64 guid, RemoveMethod meth sLFGMgr->SetState(guid, LFG_STATE_NONE); if (Player* player = ObjectAccessor::FindPlayer(guid)) { - if ((method == GROUP_REMOVEMETHOD_LEAVE && sLFGMgr->GetState(gguid) != LFG_STATE_FINISHED_DUNGEON && sLFGMgr->GetDungeon(gguid,false))) + if (method == GROUP_REMOVEMETHOD_LEAVE && sLFGMgr->GetState(gguid) != LFG_STATE_FINISHED_DUNGEON && sLFGMgr->GetDungeon(gguid, false)) player->CastSpell(player, LFG_SPELL_DUNGEON_DESERTER, true); /* else if (group->isLfgKickActive()) 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; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index ef4a7ef0f75..1ff16f3ec91 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "ahnkahet.h" enum Yells |