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 /src/server/game/Miscellaneous | |
| 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 'src/server/game/Miscellaneous')
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |