Merge

--HG--
branch : trunk

1 files changed, 10 insertions, 3 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 0c8a4eee292..ae84b6c4ff9 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3393,10 +3393,8 @@ void Spell::EffectSummonType(uint32 i)
             vehicle->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
 
             if(damage)
-            {
                 m_caster->CastSpell(vehicle, damage, true);
-                m_caster->EnterVehicle(vehicle);
-            }
+            m_caster->EnterVehicle(vehicle);
             break;
         }
     }
@@ -5135,6 +5133,15 @@ void Spell::EffectScriptEffect(uint32 effIndex)
         {
             switch(m_spellInfo->Id)
             {
+                // Heart of the Pheonix
+                case 55709:
+                {
+                    int pct = 100;
+                    if (unitTarget->GetTypeId()==TYPEID_UNIT && ((Creature*)unitTarget)->isPet())
+                        if (Unit* owner = ((Creature*)unitTarget)->GetOwner())
+                            owner->CastCustomSpell(unitTarget, 54114, &pct, NULL, NULL, true);
+                    break;
+                }
                 // Chimera Shot
                 case 53209:
                 {