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
This commit is contained in:
Shauren
2015-11-07 00:15:00 +01:00
committed by Carbenium
parent ed20680f92
commit 8ceffaef44
10 changed files with 58 additions and 2 deletions
@@ -0,0 +1,3 @@
DELETE FROM `trinity_string` WHERE `entry` = 11010;
INSERT INTO `trinity_string` VALUES
(11010, 'You had cooldowns before starting the duel, so your cooldowns haven\'t been reset.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);