1 files changed, 71 insertions, 8 deletions

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()