From 6e0b9a7916d158981cebe6107710141458d656cc Mon Sep 17 00:00:00 2001
From: ariel- <ariel-@users.noreply.github.com>
Date: Wed, 7 Mar 2018 03:32:32 -0300
Subject: Core/Creatures: port power type updates from master branch

Core/Misc: Added helper function Unit::SetFullPower
Cherry-picked from 8199eef81cad464bb43f3613ed884a2c8fc3973d

Core/Creatures: Updated power type handling (#20981)
Cherry-picked from 16a7a414abcc93c4514905b871f53c1049261c12
---
 src/server/scripts/World/duel_reset.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/server/scripts/World')

diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index bcbf14f0af0..21c928e9b58 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -46,24 +46,12 @@ class DuelResetScript : public PlayerScript
             if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_HEALTH_MANA))
             {
                 player1->SaveHealthBeforeDuel();
-                player1->SetHealth(player1->GetMaxHealth());
+                player1->SaveManaBeforeDuel();
+                player1->ResetAllPowers();
 
                 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));
-                }
+                player2->SaveManaBeforeDuel();
+                player2->ResetAllPowers();
             }
         }
 
@@ -90,11 +78,11 @@ class DuelResetScript : public PlayerScript
                     loser->RestoreHealthAfterDuel();
 
                     // check if player1 class uses mana
-                    if (winner->getPowerType() == POWER_MANA || winner->getClass() == CLASS_DRUID)
+                    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)
+                    if (loser->GetPowerType() == POWER_MANA || loser->getClass() == CLASS_DRUID)
                         loser->RestoreManaAfterDuel();
                 }
             }
-- 
cgit v1.2.3