*Update charm and possess code.

--HG--
branch : trunk

1 files changed, 226 insertions, 27 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 85f13097a14..0bf8faa5bb2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -233,7 +233,6 @@ Unit::Unit()
     m_removedAuras = 0;
     m_charmInfo = NULL;
     m_unit_movement_flags = 0;
-    m_isPossessed = false;
     m_reducedThreatPercent = 0;
     m_misdirectionTargetGUID = 0;
 
@@ -8380,7 +8379,8 @@ void Unit::SetPet(Pet* pet)
 
 void Unit::SetCharm(Unit* pet)
 {
-    SetUInt64Value(UNIT_FIELD_CHARM, pet ? pet->GetGUID() : 0);
+    if(GetTypeId() == TYPEID_PLAYER)
+        SetUInt64Value(UNIT_FIELD_CHARM, pet ? pet->GetGUID() : 0);
 }
 
 void Unit::AddPlayerToVision(Player* plr) 
@@ -8423,21 +8423,6 @@ void Unit::UncharmSelf()
     RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM);
 }
 
-void Unit::UnpossessSelf(bool attack)
-{
-    if (!isPossessed() || !GetCharmer())
-        return;
-
-    if (GetCharmer()->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)GetCharmer())->RemovePossess(attack);
-    else
-    {
-        GetCharmer()->SetCharm(0);
-        SetCharmerGUID(0);
-        m_isPossessed = false;
-    }
-}
-
 void Unit::UnsummonAllTotems()
 {
     for (int8 i = 0; i < MAX_TOTEM; ++i)
@@ -10239,7 +10224,7 @@ void Unit::setDeathState(DeathState s)
         UnsummonAllTotems();
 
         // Possessed unit died, restore control to possessor
-        UnpossessSelf(false);
+        RemoveCharmedOrPossessedBy(NULL);
         RemoveAllFromVision();
 
         ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
@@ -11098,7 +11083,7 @@ void Unit::CleanupsBeforeDelete()
 {
     if(m_uint32Values)                                      // only for fully created object
     {
-        UnpossessSelf(false);
+        RemoveCharmedOrPossessedBy(NULL);
         RemoveAllFromVision();
         InterruptNonMeleeSpells(true);
         m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
@@ -12929,22 +12914,236 @@ void Unit::SetConfused(bool apply)
         ((Player*)this)->SetClientControl(this, !apply);
 }
 
+void Unit::SetCharmedOrPossessedBy(Unit* charmer, bool possess)
+{
+    if(!charmer)
+        return;
+
+    assert(!possess || charmer->GetTypeId() == TYPEID_PLAYER);
+
+    if(this == charmer)
+        return;
+
+    if(isInFlight())
+        return;
+
+    if(GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetTransport())
+        return;
+
+    RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+    CastStop();
+    CombatStop(); //TODO: CombatStop(true) may cause crash (interrupt spells)
+    DeleteThreatList();
+
+    // Charmer stop charming
+    if(charmer->GetTypeId() == TYPEID_PLAYER)
+        ((Player*)charmer)->StopCharmOrPossess();
+
+    // Charmed stop charming
+    if(GetTypeId() == TYPEID_PLAYER)
+        ((Player*)this)->StopCharmOrPossess();
+
+    // Charmed stop being charmed
+    RemoveCharmedOrPossessedBy(NULL);
+
+    // Set charmed
+    charmer->SetCharm(this);
+    SetCharmerGUID(charmer->GetGUID());
+    setFaction(charmer->getFaction());
+    SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+
+    if(GetTypeId() == TYPEID_UNIT)
+    {
+        ((Creature*)this)->InitPossessedAI();
+        StopMoving();
+        GetMotionMaster()->Clear(false);
+        GetMotionMaster()->MoveIdle();
+    }
+    else
+    {
+        if(((Player*)this)->isAFK())
+            ((Player*)this)->ToggleAFK();
+        ((Player*)this)->SetViewport(GetGUID(), false);
+    }
+
+    // Pets already have a properly initialized CharmInfo, don't overwrite it.
+    if(GetTypeId() == TYPEID_PLAYER || GetTypeId() == TYPEID_UNIT && !((Creature*)this)->isPet())
+    {
+        CharmInfo *charmInfo = InitCharmInfo(this);
+        charmInfo->SetReactState(REACT_DEFENSIVE);
+        if(possess)
+            charmInfo->InitPossessCreateSpells();
+        else
+            charmInfo->InitCharmCreateSpells();
+    }
+
+    //Set possessed
+    if(possess)
+    {
+        addUnitState(UNIT_STAT_POSSESSED);
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN5);
+        AddPlayerToVision((Player*)charmer);
+        ((Player*)charmer)->SetViewport(GetGUID(), true);
+        charmer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
+    }
+    // Charm demon
+    else if(GetTypeId() == TYPEID_UNIT && charmer->GetTypeId() == TYPEID_PLAYER && charmer->getClass() == CLASS_WARLOCK)
+    {
+        CreatureInfo const *cinfo = ((Creature*)this)->GetCreatureInfo();
+        if(cinfo && cinfo->type == CREATURE_TYPE_DEMON)
+        {
+            //to prevent client crash
+            SetFlag(UNIT_FIELD_BYTES_0, 2048);
+
+            //just to enable stat window
+            if(GetCharmInfo())
+                GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
+
+            //if charmed two demons the same session, the 2nd gets the 1st one's name
+            SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
+        }
+    }
+
+    if(possess) 
+        ((Player*)charmer)->PossessSpellInitialize();
+    else if(charmer->GetTypeId() == TYPEID_PLAYER)
+        ((Player*)charmer)->CharmSpellInitialize();
+}
+
+void Unit::RemoveCharmedOrPossessedBy(Unit *charmer)
+{
+    if(!isCharmed())
+        return;
+
+    if(!charmer)
+        charmer = GetCharmer();
+    else if(charmer != GetCharmer()) // one aura overrides another?
+        return;
+
+    bool possess = hasUnitState(UNIT_STAT_POSSESSED);
+
+    CastStop();
+    CombatStop(); //TODO: CombatStop(true) may cause crash (interrupt spells)
+    getHostilRefManager().deleteReferences();
+    DeleteThreatList();
+    SetCharmerGUID(0);
+    RestoreFaction();
+
+    if(possess)
+    {
+        clearUnitState(UNIT_STAT_POSSESSED);
+        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN5);
+    }
+
+    if(GetTypeId() == TYPEID_UNIT)
+    {
+        if(!((Creature*)this)->isPet())
+            RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+
+        ((Creature*)this)->DisablePossessedAI();
+        if(isAlive() && ((Creature*)this)->AI())
+        {
+            if(charmer && !IsFriendlyTo(charmer))
+            {
+                ((Creature*)this)->AddThreat(charmer, 10000.0f);
+                ((Creature*)this)->AI()->AttackStart(charmer);
+            }
+            else
+                ((Creature*)this)->AI()->EnterEvadeMode();
+        }
+    }
+    else
+        ((Player*)this)->SetViewport(GetGUID(), true);
+
+    // If charmer still exists
+    if(!charmer)
+        return;
+
+    assert(!possess || charmer->GetTypeId() == TYPEID_PLAYER);
+           
+    charmer->SetCharm(0);
+    if(possess)
+    {
+        RemovePlayerFromVision((Player*)charmer);
+        ((Player*)charmer)->SetViewport(charmer->GetGUID(), true);
+        charmer->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
+    }
+    // restore UNIT_FIELD_BYTES_0
+    else if(GetTypeId() == TYPEID_UNIT && charmer->GetTypeId() == TYPEID_PLAYER && charmer->getClass() == CLASS_WARLOCK)
+    {
+        CreatureInfo const *cinfo = ((Creature*)this)->GetCreatureInfo();
+        if(cinfo && cinfo->type == CREATURE_TYPE_DEMON)
+        {
+            CreatureDataAddon const *cainfo = ((Creature*)this)->GetCreatureAddon();
+            if(cainfo && cainfo->bytes0 != 0)
+                SetUInt32Value(UNIT_FIELD_BYTES_0, cainfo->bytes0);
+            else
+                RemoveFlag(UNIT_FIELD_BYTES_0, 2048);
+
+            if(GetCharmInfo())
+                GetCharmInfo()->SetPetNumber(0, true);
+            else
+                sLog.outError("Aura::HandleModCharm: target="I64FMTD" with typeid=%d has a charm aura but no charm info!", GetGUID(), GetTypeId());
+        }
+    }
+
+    if(possess || charmer->GetTypeId() == TYPEID_PLAYER)
+    {
+        // Remove pet spell action bar
+        WorldPacket data(SMSG_PET_SPELLS, 8);
+        data << uint64(0);
+        ((Player*)charmer)->GetSession()->SendPacket(&data);
+    }
+}
+
+void Unit::RestoreFaction()
+{
+    if(GetTypeId() == TYPEID_PLAYER)
+        ((Player*)this)->setFactionForRace(getRace());
+    else
+    {
+        CreatureInfo const *cinfo = ((Creature*)this)->GetCreatureInfo();
+
+        if(((Creature*)this)->isPet())
+        {
+            if(Unit* owner = GetOwner())
+                setFaction(owner->getFaction());
+            else if(cinfo)
+                setFaction(cinfo->faction_A);
+        }
+        else if(cinfo)  // normal creature
+            setFaction(cinfo->faction_A);
+    }
+}
+
 bool Unit::IsInPartyWith(Unit const *unit) const
 {
-    const Player *p1 = GetCharmerOrOwnerPlayerOrPlayerItself();
-    const Player *p2 = unit->GetCharmerOrOwnerPlayerOrPlayerItself();
-    if(p1 && p2)
-        return p1->IsInSameGroupWith(p2);
+    if(this == unit)
+        return true;
+
+    const Unit *u1 = GetCharmerOrOwnerOrSelf();
+    const Unit *u2 = unit->GetCharmerOrOwnerOrSelf();
+    if(u1 == u2)
+        return true;
+
+    if(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
+        return ((Player*)u1)->IsInSameGroupWith((Player*)u2);
     else
         return false;
 }
 
 bool Unit::IsInRaidWith(Unit const *unit) const
 {
-    const Player *p1 = GetCharmerOrOwnerPlayerOrPlayerItself();
-    const Player *p2 = unit->GetCharmerOrOwnerPlayerOrPlayerItself();
-    if(p1 && p2)
-        return p1->IsInSameRaidWith(p2);
+    if(this == unit)
+        return true;
+
+    const Unit *u1 = GetCharmerOrOwnerOrSelf();
+    const Unit *u2 = unit->GetCharmerOrOwnerOrSelf();
+    if(u1 == u2)
+        return true;
+
+    if(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
+        return ((Player*)u1)->IsInSameRaidWith((Player*)u2);
     else
         return false;
 }