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 /sql | |
| 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 'sql')
| -rw-r--r-- | sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql | 3 |
1 files changed, 3 insertions, 0 deletions
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); |