diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-10-17 18:38:31 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:35:24 +0100 |
| commit | 63f253e95ca801966077282f27767cf1d191bfec (patch) | |
| tree | 331e2bc4061ba8f1cd302e605fc55b6dd00b3fff /src/server/game/World | |
| parent | 8ceffaef4419d6dffe70ccc2fee1a4d5180ea546 (diff) | |
Merge pull request #15697 from ShinDarth/cd
Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47078abf54e8a1c50321e63193a7c68d)
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/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index fb60d2bf382..d8496aa33e8 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1278,7 +1278,7 @@ void World::LoadConfigSettings(bool reload) if (m_bool_configs[CONFIG_START_ALL_SPELLS]) TC_LOG_WARN("server.loading", "PlayerStart.AllSpells enabled - may not function as intended!"); m_int_configs[CONFIG_HONOR_AFTER_DUEL] = sConfigMgr->GetIntDefault("HonorPointsAfterDuel", 0); - m_bool_configs[CONFIG_RESET_COOLDOWN_AFTER_DUEL] = sConfigMgr->GetBoolDefault("ResetCoolDownAfterDuel", 0); + m_bool_configs[CONFIG_RESET_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", 0); m_bool_configs[CONFIG_START_ALL_EXPLORED] = sConfigMgr->GetBoolDefault("PlayerStart.MapsExplored", false); m_bool_configs[CONFIG_START_ALL_REP] = sConfigMgr->GetBoolDefault("PlayerStart.AllReputation", false); m_bool_configs[CONFIG_ALWAYS_MAXSKILL] = sConfigMgr->GetBoolDefault("AlwaysMaxWeaponSkill", false); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 923177683f1..153a7730bef 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -176,7 +176,7 @@ enum WorldBoolConfigs CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA, CONFIG_FEATURE_SYSTEM_BPAY_STORE_ENABLED, CONFIG_FEATURE_SYSTEM_CHARACTER_UNDELETE_ENABLED, - CONFIG_RESET_COOLDOWN_AFTER_DUEL, + CONFIG_RESET_DUEL_COOLDOWNS, BOOL_CONFIG_VALUE_COUNT }; |