1 files changed, 51 insertions, 6 deletions

diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index f08469d5bd5..f7d7201c56a 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -26,6 +26,7 @@ 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();
@@ -34,18 +35,62 @@ class DuelResetScript : public PlayerScript
                 player1->RemoveArenaSpellCooldowns(true);
                 player2->RemoveArenaSpellCooldowns(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->SaveManaBeforeDuel();
+                    player1->SetPower(POWER_MANA, player1->GetMaxPower(POWER_MANA));
+                }
+
+                // check if player2 class uses mana
+                if (player2->getPowerType() == POWER_MANA)
+                {
+                    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
+            if (type != DUEL_INTERRUPTED)
             {
-                winner->RemoveArenaSpellCooldowns(true);
-                loser->RemoveArenaSpellCooldowns(true);
+                // Cooldown restore
+                if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
+                {
+                    winner->RemoveArenaSpellCooldowns(true);
+                    loser->RemoveArenaSpellCooldowns(true);
+
+                    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->RestoreManaAfterDuel(); 
 
-                winner->GetSpellHistory()->RestoreCooldownStateAfterDuel();
-                loser->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+                    // check if player2 class uses mana
+                    if (loser->getPowerType() == POWER_MANA)
+                        loser->RestoreManaAfterDuel(); 
+                }
             }
         }
 };