From 8ceffaef4419d6dffe70ccc2fee1a4d5180ea546 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 5 Oct 2015 16:57:02 +0200 Subject: 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 --- sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql (limited to 'sql') diff --git a/sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql b/sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql new file mode 100644 index 00000000000..95f91cd5938 --- /dev/null +++ b/sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql @@ -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); -- cgit v1.2.3