Merge pull request #15731 from ShinDarth/toscri

Convert the Duel Cooldown Reset feature to scripts
(cherry picked from commit 5c449b50aadcb35a4bd7fdc25d3a249f023cf507)

4 files changed, 3 insertions, 19 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index b03532a5975..797b5691891 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7474,15 +7474,6 @@ void Player::DuelComplete(DuelCompleteType type)
     duel->opponent->SetGuidValue(PLAYER_DUEL_ARBITER, ObjectGuid::Empty);
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 0);
 
-    if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
-    {
-        RemoveArenaSpellCooldowns(true);
-        duel->opponent->RemoveArenaSpellCooldowns(true);
-
-        GetSpellHistory()->RestoreCooldownStateAfterDuel();
-        duel->opponent->GetSpellHistory()->RestoreCooldownStateAfterDuel();
-    }
-
     delete duel->opponent->duel;
     duel->opponent->duel = NULL;
     delete duel;
diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp
index 52bf7c612ff..40d6f469c9e 100644
--- a/src/server/game/Handlers/DuelHandler.cpp
+++ b/src/server/game/Handlers/DuelHandler.cpp
@@ -69,15 +69,6 @@ void WorldSession::HandleDuelAccepted()
     TC_LOG_DEBUG("network", "Player 1 is: %s (%s)", player->GetGUID().ToString().c_str(), player->GetName().c_str());
     TC_LOG_DEBUG("network", "Player 2 is: %s (%s)", plTarget->GetGUID().ToString().c_str(), plTarget->GetName().c_str());
 
-    if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
-    {
-        player->GetSpellHistory()->SaveCooldownStateBeforeDuel();
-        plTarget->GetSpellHistory()->SaveCooldownStateBeforeDuel();
-
-        player->RemoveArenaSpellCooldowns(true);
-        plTarget->RemoveArenaSpellCooldowns(true);
-    }
-
     time_t now = time(NULL);
     player->duel->startTimer = now;
     plTarget->duel->startTimer = now;
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 3e9f8ca42eb..40e522a185e 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -93,6 +93,7 @@ void AddSC_npcs_special();
 void AddSC_npc_taxi();
 void AddSC_achievement_scripts();
 void AddSC_action_ip_logger();
+void AddSC_duel_reset();
 
 //eastern kingdoms
 void AddSC_alterac_valley();                 //Alterac Valley
@@ -809,6 +810,7 @@ void AddWorldScripts()
     // To avoid duplicate code, we check once /*ONLY*/ if logging is permitted or not.
     if (sWorld->getBoolConfig(CONFIG_IP_BASED_ACTION_LOGGING))
         AddSC_action_ip_logger(); // location: scripts\World\action_ip_logger.cpp
+    AddSC_duel_reset();
 #endif
 }
 
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index d8496aa33e8..45f37da4a13 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_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", 0);
+    m_bool_configs[CONFIG_RESET_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", false);
     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);