aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTrond B Krokli <tkrokli@gmail.com>2016-05-26 21:23:59 +0200
committerShauren <shauren.trinity@gmail.com>2016-05-26 21:23:59 +0200
commitdc67505a081fed7d59fe833ad9ec5a3741a78e8f (patch)
tree9044d4b89bc4f401ef13bd3ae55859e903e00a3c /src
parent4ebed6e586b00051333f11dcf60c680a4ad13db9 (diff)
[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
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellEffects.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 9d0370c0255..8a16812034c 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -3019,6 +3019,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();