Merge pull request #15732 from ShinDarth/reset-health-mana

Scripts/Duel: implement duel reset of health and mana and improve duel reset
(cherry picked from commit a1150ce20f9db4634bcb7932f3f4c50a5be1d718)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp

6 files changed, 100 insertions, 23 deletions

diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 89c4c3d7daa..ca6c1dbdf56 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2085,6 +2085,12 @@ class Player : public Unit, public GridObject<Player>
         bool RewardHonor(Unit* victim, uint32 groupsize, int32 honor = -1, bool pvptoken = false);
         uint32 GetMaxPersonalArenaRatingRequirement(uint32 minarenaslot) const;
 
+        // duel health and mana reset methods
+        void SaveHealthBeforeDuel() { healthBeforeDuel = GetHealth(); }
+        void SaveManaBeforeDuel() { manaBeforeDuel = GetPower(POWER_MANA); }
+        void RestoreHealthAfterDuel() { SetHealth(healthBeforeDuel); }
+        void RestoreManaAfterDuel() { SetPower(POWER_MANA, manaBeforeDuel); }
+
         //End of PvP System
 
         void SetDrunkValue(uint8 newDrunkValue, uint32 itemId = 0);
@@ -2815,6 +2821,10 @@ class Player : public Unit, public GridObject<Player>
 
         bool _advancedCombatLoggingEnabled;
 
+        // variables to save health and mana before duel and restore them after duel
+        uint32 healthBeforeDuel;
+        uint32 manaBeforeDuel;
+
         WorldLocation _corpseLocation;
 };
 
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index a8059dc3226..15135b68623 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -908,24 +908,19 @@ void SpellHistory::RestoreCooldownStateAfterDuel()
                 _spellCooldownsBeforeDuel[c.first] = _spellCooldowns[c.first];
         }
 
-        _spellCooldowns = _spellCooldownsBeforeDuel;
-
-        // update the client: clear all cooldowns
-        std::vector<int32> resetCooldowns;
-        resetCooldowns.reserve(_spellCooldowns.size());
-
-        for (auto const& c : _spellCooldowns)
-            resetCooldowns.push_back(c.first);
-
-        if (resetCooldowns.empty())
-            return;
-
-        SendClearCooldowns(resetCooldowns);
+        // check for spell with onHold active before and during the duel
+        for (auto itr = _spellCooldownsBeforeDuel.begin(); itr != _spellCooldownsBeforeDuel.end(); ++itr)
+        {
+            if (!itr->second.OnHold &&
+                _spellCooldowns.find(itr->first) != _spellCooldowns.end() &&
+                !_spellCooldowns[itr->first].OnHold)
+                _spellCooldowns[itr->first] = _spellCooldownsBeforeDuel[itr->first];
+        }
 
         // update the client: restore old cooldowns
         WorldPackets::Spells::SpellCooldown spellCooldown;
         spellCooldown.Caster = _owner->GetGUID();
-        spellCooldown.Flags = SPELL_COOLDOWN_FLAG_NONE;
+        spellCooldown.Flags = SPELL_COOLDOWN_FLAG_INCLUDE_EVENT_COOLDOWNS;
 
         for (auto const& c : _spellCooldowns)
         {
@@ -933,7 +928,7 @@ void SpellHistory::RestoreCooldownStateAfterDuel()
             uint32 cooldownDuration = c.second.CooldownEnd > now ? std::chrono::duration_cast<std::chrono::milliseconds>(c.second.CooldownEnd - now).count() : 0;
 
             // cooldownDuration must be between 0 and 10 minutes in order to avoid any visual bugs
-            if (cooldownDuration == 0 || cooldownDuration > 10 * MINUTE * IN_MILLISECONDS)
+            if (cooldownDuration <= 0 || cooldownDuration > 10 * MINUTE * IN_MILLISECONDS || c.second.OnHold)
                 continue;
 
             spellCooldown.SpellCooldowns.emplace_back(c.first, cooldownDuration);
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index fa0b67082d2..41badb1271c 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1279,6 +1279,7 @@ void World::LoadConfigSettings(bool reload)
         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", false);
+    m_bool_configs[CONFIG_RESET_DUEL_HEALTH_MANA] = sConfigMgr->GetBoolDefault("ResetDuelHealthMana", 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);
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 153a7730bef..59e50f2dd4f 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -177,6 +177,7 @@ enum WorldBoolConfigs
     CONFIG_FEATURE_SYSTEM_BPAY_STORE_ENABLED,
     CONFIG_FEATURE_SYSTEM_CHARACTER_UNDELETE_ENABLED,
     CONFIG_RESET_DUEL_COOLDOWNS,
+    CONFIG_RESET_DUEL_HEALTH_MANA,
     BOOL_CONFIG_VALUE_COUNT
 };
 
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index f08469d5bd5..ae98c0eb4ab 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -17,6 +17,7 @@
 
 #include "ScriptMgr.h"
 #include "Player.h"
+#include "Pet.h"
 
 class DuelResetScript : public PlayerScript
 {
@@ -26,28 +27,90 @@ class DuelResetScript : public PlayerScript
         // Called when a duel starts (after 3s countdown)
         void OnDuelStart(Player* player1, Player* player2) override
         {
+            // Cooldowns reset
             if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
             {
                 player1->GetSpellHistory()->SaveCooldownStateBeforeDuel();
                 player2->GetSpellHistory()->SaveCooldownStateBeforeDuel();
 
-                player1->RemoveArenaSpellCooldowns(true);
-                player2->RemoveArenaSpellCooldowns(true);
+
+                ResetSpellCooldowns(player1, true);
+                ResetSpellCooldowns(player2, true);
+            }
+
+            // Health and mana reset
+            if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_HEALTH_MANA))
+            {
+                player1->SaveHealthBeforeDuel();
+                player1->SetHealth(player1->GetMaxHealth());
+
+                player2->SaveHealthBeforeDuel();
+                player2->SetHealth(player2->GetMaxHealth());
+
+                // check if player1 class uses mana
+                if (player1->getPowerType() == POWER_MANA || player1->getClass() == CLASS_DRUID)
+                {
+                    player1->SaveManaBeforeDuel();
+                    player1->SetPower(POWER_MANA, player1->GetMaxPower(POWER_MANA));
+                }
+
+                // check if player2 class uses mana
+                if (player2->getPowerType() == POWER_MANA || player2->getClass() == CLASS_DRUID)
+                {
+                    player2->SaveManaBeforeDuel();
+                    player2->SetPower(POWER_MANA, player2->GetMaxPower(POWER_MANA));
+                }
             }
         }
 
         // Called when a duel ends
-        void OnDuelEnd(Player* winner, Player* loser, DuelCompleteType /*type*/) override
+        void OnDuelEnd(Player* winner, Player* loser, DuelCompleteType type) override
         {
-            if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
+            // do not reset anything if DUEL_INTERRUPTED or DUEL_FLED
+            if (type == DUEL_WON)
             {
-                winner->RemoveArenaSpellCooldowns(true);
-                loser->RemoveArenaSpellCooldowns(true);
+                // Cooldown restore
+                if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
+                {
+
+                    ResetSpellCooldowns(winner, true);
+                    ResetSpellCooldowns(loser, true);
 
-                winner->GetSpellHistory()->RestoreCooldownStateAfterDuel();
-                loser->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+                    winner->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+                    loser->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+                }
+
+                // Health and mana restore
+                if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_HEALTH_MANA))
+                {
+                    winner->RestoreHealthAfterDuel();
+                    loser->RestoreHealthAfterDuel();
+
+                    // check if player1 class uses mana
+                    if (winner->getPowerType() == POWER_MANA || winner->getClass() == CLASS_DRUID)
+                        winner->RestoreManaAfterDuel(); 
+
+                    // check if player2 class uses mana
+                    if (loser->getPowerType() == POWER_MANA || loser->getClass() == CLASS_DRUID)
+                        loser->RestoreManaAfterDuel(); 
+                }
             }
         }
+
+        void ResetSpellCooldowns(Player* player, bool removeActivePetCooldowns)
+        {
+            // remove cooldowns on spells that have < 10 min CD and has no onHold
+            player->GetSpellHistory()->ResetCooldowns([](SpellHistory::CooldownStorageType::iterator itr) -> bool
+            {
+                SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(itr->first);
+                return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS && !itr->second.OnHold;
+            }, true);
+
+            // pet cooldowns
+            if (removeActivePetCooldowns)
+                if (Pet* pet = player->GetPet())
+                    pet->GetSpellHistory()->ResetAllCooldowns();
+        }
 };
 
 void AddSC_duel_reset()
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 23e7c20a966..7502875a790 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2667,6 +2667,13 @@ HonorPointsAfterDuel = 0
 
 ResetDuelCooldowns = 0
 
+#    ResetDuelHealthMana
+#        Description: Reset health and mana before duel starts and restore them when duel ends.
+#        Default:     0  - (Disabled)
+#                     1  - (Enabled)
+
+ResetDuelHealthMana = 0
+
 #
 #    AlwaysMaxWeaponSkill
 #        Description: Players will automatically gain max weapon/defense skill when logging in,