Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +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
sql/updates/world/2015_11_07_00_world_2015_10_02_01.sql Normal file
View File

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