Scripts/DuelReset:

- impemented health and mana reset
- do not reset anything when duel is interrupted

5 files changed, 70 insertions, 6 deletions

diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 17176786085..1eda4dc636f 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1946,6 +1946,12 @@ class Player : public Unit, public GridObject<Player>
         uint32 GetMaxPersonalArenaRatingRequirement(uint32 minarenaslot) const;
         void SetHonorPoints(uint32 value);
         void SetArenaPoints(uint32 value);
+        
+        // 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
 
@@ -2631,6 +2637,10 @@ class Player : public Unit, public GridObject<Player>
 
         uint32 _activeCheats;
 
+        // 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/World/World.cpp b/src/server/game/World/World.cpp
index 1c401be97c6..2fe286c547a 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1192,6 +1192,7 @@ void World::LoadConfigSettings(bool reload)
     m_bool_configs[CONFIG_START_ALL_SPELLS] = sConfigMgr->GetBoolDefault("PlayerStart.AllSpells", false);
     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 7c7af77d19d..6b0a63f5b2f 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -162,6 +162,7 @@ enum WorldBoolConfigs
     CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA,
     CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA,
     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..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(); 
+                }
             }
         }
 };
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 221fea12399..a48df5ae460 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2622,6 +2622,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,