*Remove puppet when it is killed.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index 5c7ca2a48ea..2be94e29c38 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -320,14 +320,12 @@ Puppet::Puppet(SummonPropertiesEntry const *properties, Unit *owner) : Minion(pr
     assert(owner->GetTypeId() == TYPEID_PLAYER);
     m_owner = (Player*)owner;
     m_summonMask |= SUMMON_MASK_PUPPET;
-    InitCharmInfo();
 }
 
 void Puppet::InitStats(uint32 duration)
 {
     Minion::InitStats(duration);
-
-    m_charmInfo->InitPossessCreateSpells();
+    SetLevel(m_owner->getLevel());
     SetReactState(REACT_PASSIVE);
 }
 
@@ -343,6 +341,8 @@ void Puppet::Update(uint32 time)
     //check if caster is channelling?
     if(IsInWorld())
     {
+        if(!isAlive())
+            UnSummon();
     }
 }