diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-10-17 18:38:31 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:35:24 +0100 |
| commit | 63f253e95ca801966077282f27767cf1d191bfec (patch) | |
| tree | 331e2bc4061ba8f1cd302e605fc55b6dd00b3fff /src/server/game/Handlers/DuelHandler.cpp | |
| parent | 8ceffaef4419d6dffe70ccc2fee1a4d5180ea546 (diff) | |
Merge pull request #15697 from ShinDarth/cd
Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47078abf54e8a1c50321e63193a7c68d)
Conflicts:
src/server/game/Spells/SpellHistory.cpp
src/server/game/Spells/SpellHistory.h
src/server/game/World/World.h
Diffstat (limited to 'src/server/game/Handlers/DuelHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/DuelHandler.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp index d22525ab091..52bf7c612ff 100644 --- a/src/server/game/Handlers/DuelHandler.cpp +++ b/src/server/game/Handlers/DuelHandler.cpp @@ -69,8 +69,14 @@ void WorldSession::HandleDuelAccepted() TC_LOG_DEBUG("network", "Player 1 is: %s (%s)", player->GetGUID().ToString().c_str(), player->GetName().c_str()); TC_LOG_DEBUG("network", "Player 2 is: %s (%s)", plTarget->GetGUID().ToString().c_str(), plTarget->GetName().c_str()); - player->UpdateHasCoolDownBeforeDuel(); - plTarget->UpdateHasCoolDownBeforeDuel(); + if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS)) + { + player->GetSpellHistory()->SaveCooldownStateBeforeDuel(); + plTarget->GetSpellHistory()->SaveCooldownStateBeforeDuel(); + + player->RemoveArenaSpellCooldowns(true); + plTarget->RemoveArenaSpellCooldowns(true); + } time_t now = time(NULL); player->duel->startTimer = now; |