diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-10-05 16:57:02 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:15:00 +0100 |
| commit | 8ceffaef4419d6dffe70ccc2fee1a4d5180ea546 (patch) | |
| tree | 97acf23b22ef45a9f9a4d7790a9cf0e524a1c195 /src/server/game/Handlers/DuelHandler.cpp | |
| parent | ed20680f92f5288f3a158e02b576d9e280120444 (diff) | |
Merge pull request #15646 from ShinDarth/ticket
Core/Player: implement ResetCoolDownAfterDuel configurable feature
(cherry picked from commit 5b8f1469ca32ff1b02b8f902954e1ffc362c4343)
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp index 40d6f469c9e..d22525ab091 100644 --- a/src/server/game/Handlers/DuelHandler.cpp +++ b/src/server/game/Handlers/DuelHandler.cpp @@ -69,6 +69,9 @@ 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(); + time_t now = time(NULL); player->duel->startTimer = now; plTarget->duel->startTimer = now; |