Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15646 from ShinDarth/ticket

Browse Source 
Core/Player: implement ResetCoolDownAfterDuel configurable feature
(cherry picked from commit 5b8f1469ca)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
This commit is contained in:
Shauren
2015-10-05 16:57:02 +02:00
committed by Carbenium
parent ed20680f92
commit 8ceffaef44
10 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Handlers/DuelHandler.cpp
View File

@@ -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;