From d716e6049a9ee3e0876f5bfc384d70e2280c86c5 Mon Sep 17 00:00:00 2001
From: Trond B Krokli <tkrokli@gmail.com>
Date: Thu, 26 May 2016 21:23:59 +0200
Subject: [PATCH] [3.3.5] Core/Spell: restore old pet values after dismount
 (#16551)

* Core/Spell: restore old pet values after dismount & re-summon
Original PR #15667 by ghost

Closes #873
---
 src/server/game/Spells/SpellEffects.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 0fe870701c8..e1a7683f7d6 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -2782,6 +2782,12 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex)
             //OldSummon->Relocate(px, py, pz, OldSummon->GetOrientation());
             //OldSummon->SetMap(owner->GetMap());
             //owner->GetMap()->Add(OldSummon->ToCreature());
+            if (OldSummon->getPetType() == SUMMON_PET)
+            {
+                OldSummon->SetHealth(OldSummon->GetMaxHealth());
+                OldSummon->SetPower(OldSummon->getPowerType(),
+                    OldSummon->GetMaxPower(OldSummon->getPowerType()));
+            }
 
             if (owner->GetTypeId() == TYPEID_PLAYER && OldSummon->isControlled())
                 owner->ToPlayer()->PetSpellInitialize();