From 63f253e95ca801966077282f27767cf1d191bfec Mon Sep 17 00:00:00 2001 From: MitchesD Date: Sat, 17 Oct 2015 18:38:31 +0200 Subject: 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 --- src/server/worldserver/worldserver.conf.dist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/worldserver') diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index e8cebe043c1..6120107a6f2 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2660,12 +2660,12 @@ PlayerStart.MapsExplored = 0 HonorPointsAfterDuel = 0 # -# ResetCoolDownAfterDuel -# Description: Reset all cooldowns after duel, but only if player has no cooldowns before the duel. +# ResetDuelCooldowns +# Description: Reset all cooldowns before duel starts and restore them when duel ends. # Default: 0 - (Disabled) # 1 - (Enabled) -ResetCoolDownAfterDuel = 0 +ResetDuelCooldowns = 0 # # AlwaysMaxWeaponSkill -- cgit v1.2.3