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 --- src/server/game/Miscellaneous/Language.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/game/Miscellaneous') diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index b52bdbe9f08..4c1c95047fe 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1210,6 +1210,8 @@ enum TrinityStrings LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007, LANG_NPCINFO_INHABIT_TYPE = 11008, - LANG_NPCINFO_FLAGS_EXTRA = 11009 + LANG_NPCINFO_FLAGS_EXTRA = 11009, + + LANG_COOLDOWN_NOT_RESET_AFTER_DUEL = 11010 }; #endif -- cgit v1.2.3