Changeset 189 for trunk/src/game/Player.cpp

Timestamp:

11/19/08 13:44:45 (17 years ago)

Author:

yumileroy

Message:

[svn] Possession:
* Fixed player not having PvP flag on remove
* Fixed pet resetting its aggro on remove
* Fixed pet bar resetting on remove (?)
* Added dummy handler for NOT_ACTIVE_MOVER, display message only in debug logging mode

Original author: gvcoman
Date: 2008-11-07 16:49:42-06:00

Files:

• trunk/src/game/Player.cpp (modified) (7 diffs)

trunk/src/game/Player.cpp

@@ -18661 +18661 @@
     SetPossessedTarget(target);
 
+    uint32 flags1 = target->GetUInt32Value(UNIT_FIELD_FLAGS);
+
     target->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction());
     target->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -18668 +18670 @@
     SetUInt64Value(PLAYER_FARSIGHT, target->GetGUID());
 
+    uint32 flags2 = target->GetUInt32Value(UNIT_FIELD_FLAGS);
+
     if(target->GetTypeId() == TYPEID_UNIT)
     {
@@ -18721 +18725 @@
     }
 
+    // Interrupt any current casting of the target
+    if(target->IsNonMeleeSpellCasted(true))
+        target->InterruptNonMeleeSpells(true);
+
     RemovePossessedTarget();
 
@@ -18744 +18752 @@
 
     target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN5);
-    target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
     SetUInt64Value(PLAYER_FARSIGHT, 0);
@@ -18759 +18766 @@
     else
     {
+        target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
         if(((Creature*)target)->isPet())
-        {
-            ((Pet*)target)->InitPetCreateSpells();
             PetSpellInitialize();
-        }
-
-        if (target->isAlive())
+        else if (target->isAlive())
         {
             // If we're still hostile to our target, continue attacking otherwise reset threat and go home
-            if (target->getVictim())
-            {
-                Unit* victim = target->getVictim();
+            if (Unit* victim = target->getVictim())
+            {
                 FactionTemplateEntry const* t_faction = target->getFactionTemplateEntry();
                 FactionTemplateEntry const* v_faction = victim->getFactionTemplateEntry();
@@ -18784 +18787 @@
                 }
             } 
-            else if (target->GetTypeId() == TYPEID_UNIT)
+            else
             {
                 target->GetMotionMaster()->Clear();
@@ -18791 +18794 @@
             
             // Add high amount of threat on the player
-            if(target != GetPet() && attack)
+            if(attack)
                 target->AddThreat(this, 1000000.0f);
         }