*Merge.

--HG-- branch : trunk
2009-03-07 10:19:07 -06:00
parent 318f173dd3 6dc06ab53b
commit 814c6c2c39
4 changed files with 10 additions and 12 deletions
@@ -6536,11 +6536,14 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
    Unit* caster = GetCaster();
    if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
        return;
-    if(caster->GetPet() != m_target)
-        return;

    if(apply)
+    {
+        if(caster->GetPet() != m_target)
+            return;    
+    
        m_target->SetCharmedOrPossessedBy(caster, true);
+    }
    else
    {
        m_target->RemoveCharmedOrPossessedBy(caster);