Changeset 3202

Timestamp:

03/08/2010 04:03:23 PM (6 months ago)

Author:

jackpoz

Message:

FIXED: Dead pets will only be despawned if the owner logs out or gets out of range instead of despawning after 3 minutes. They will also not be displayed in the character selection anymore, furthermore logging in will not summon a dead pet. Call pet will not anymore summon a dead pet and instead will return "Your pet is dead". Dead pets can be stabled but it will not revive them.
* REMEMBER TO APPLY THE REQUIRED CHARACTER DB UPDATE!!!! *

Location:

trunk

Files:

• sql/3202_character_structure.sql (moved) (moved from trunk/sql/3176_character_structure.sql) (1 diff)
• sql/character_updates/3202_hunterpets.sql (added)
• src/arcemu-world/CharacterHandler.cpp (modified) (1 diff)
• src/arcemu-world/Pet.cpp (modified) (6 diffs)
• src/arcemu-world/PetHandler.cpp (modified) (5 diffs)
• src/arcemu-world/Player.cpp (modified) (3 diffs)
• src/arcemu-world/Player.h (modified) (1 diff)
• src/arcemu-world/SpellEffects.cpp (modified) (2 diffs)

trunk/sql/3202_character_structure.sql

@@ -758 +758 @@
   `spellid` int(10) unsigned NOT NULL DEFAULT '0',
   `petstate` int(10) unsigned NOT NULL DEFAULT '0',
+  `alive` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`ownerguid`,`petnumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;

trunk/src/arcemu-world/CharacterHandler.cpp

@@ -210 +210 @@
                         if( Class == WARLOCK || Class == HUNTER )
                         {
-                                res = CharacterDatabase.Query("SELECT entry FROM playerpets WHERE ownerguid = %u AND MOD( active, 10 ) = 1;", Arcemu::Util::GUID_LOPART( guid ) );
+                                res = CharacterDatabase.Query("SELECT entry FROM playerpets WHERE ownerguid = %u AND MOD( active, 10 ) = 1 AND alive = TRUE;", Arcemu::Util::GUID_LOPART( guid ) );
 
                                 if(res)

trunk/src/arcemu-world/Pet.cpp

@@ -264 +264 @@
                 pp->stablestate = STABLE_STATE_ACTIVE;
                 pp->spellid = created_by_spell ? created_by_spell->Id : 0;
+                pp->alive = true;
+                mPi = pp;
                 owner->AddPlayerPet( pp, pp->number );
         }
@@ -296 +298 @@
         m_AISpellStore.clear();
         mSpells.clear();
+        mPi = NULL;
 }
 
@@ -308 +311 @@
 
         mSpells.clear();
+
+        Arcemu::Util::ARCEMU_ASSERT( m_Owner == NULL );//if it's not NULL then it's being deleted without notifing the owner
 }
 
 void Pet::Update( uint32 time )
 {
-        Creature::Update( time ); // passthrough
+        if(Summon)
+                Creature::Update( time ); // passthrough
+        else
+        {
+                Unit::Update( time);//Dead Hunter's Pets should be despawned only if the Owner logs out or goes out of range.
+                if(m_corpseEvent)
+                {
+                        sEventMgr.RemoveEvents(this);
+                        m_corpseEvent = false;
+                }
+        }
 
         if( !Summon && !bExpires && isAlive() )
@@ -628 +643 @@
         }
 
+        //if pet was dead on logout then it should be dead now too.//we could use mPi->alive but this will break backward compatibility
+        if( HasFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_DEAD ))//LoadFromDB() (called by Player::SpawnPet() ) now always revive the Pet if it was dead.
+                                                                                                        //This is because now we call SpawnPet() only if it's alive or we wanna revive it.
+        {
+                SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0 );
+                SetHealth( GetMaxHealth() );//this is modified (if required) in Spell::SpellEffectSummonDeadPet() 
+                setDeathState( ALIVE );
+        }
+
         InitializeMe( false );
-
-        //if pet was dead on logout then it should be dead now too
-        if( HasFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_DEAD ) )
-        {
-                SetHealth( 0); //this is probably already 0
-                setDeathState( JUST_DIED );
-                m_Owner->EventDismissPet();     //just in case in near future(or any other) on loading auras get applied then make sure we remove those
-        }
 }
 
@@ -773 +789 @@
         pi->reset_time = reset_time;
     pi->petstate = m_State;
+        pi->alive = isAlive();
 }
 
@@ -832 +849 @@
                 sEventMgr.AddEvent( this ,&Pet::Dismiss , EVENT_UNK, 1 , 1, EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT ); 
         }
+        if(mPi != NULL)
+                mPi->alive = isAlive();
 }
 

trunk/src/arcemu-world/PetHandler.cpp

@@ -256 +256 @@
         // remove pet from world and association with player
         Pet *pPet = _player->GetSummon();
-        if( !pPet || pPet->IsSummon() ) 
+        if( pPet != NULL && pPet->IsSummon() ) 
                 return;
         
@@ -264 +264 @@
         pet->stablestate = STABLE_STATE_PASSIVE;
         
-        pPet->Remove( true, true );
+        if( pPet != NULL )//if pPet is NULL here then the pet is dead and we relogged.
+                pPet->Remove( true, true );
 
         WorldPacket data(1);
@@ -286 +287 @@
                 return;
         }
-        _player->SpawnPet( petnumber );
+        //unstable selected pet but spawn it only if it's alive
+        if( pet->alive )
+                _player->SpawnPet( petnumber );
         pet->stablestate = STABLE_STATE_ACTIVE;
 
@@ -309 +312 @@
         }
         Pet *pPet = _player->GetSummon();
-        if( !pPet || pPet->IsSummon() )
+        if( pPet != NULL && pPet->IsSummon() )
                 return;
 
@@ -317 +320 @@
                 return;
 
-        pPet->Remove( true, true );
+        if( pPet != NULL)//if pPet is NULL here then the pet is dead and we relogged.
+                pPet->Remove( true, true );
         pet2->stablestate = STABLE_STATE_PASSIVE;
 
-        //unstable selected pet
-        _player->SpawnPet( petnumber );
+        //unstable selected pet but spawn it only if it's alive
+        if( pet->alive )
+                _player->SpawnPet( petnumber );
         pet->stablestate = STABLE_STATE_ACTIVE;
 

trunk/src/arcemu-world/Player.cpp

@@ -1994 +1994 @@
                         << itr->second->reset_cost << "','"
                         << itr->second->spellid << "','"
-            << itr->second->petstate << "')";
+            << itr->second->petstate << "','"
+                        << itr->second->alive << "')";
 
         if(buf == NULL)
@@ -2093 +2094 @@
                 pet->spellid = fields[13].GetUInt32();
         pet->petstate = fields[14].GetUInt32();
+                pet->alive = fields[15].GetBool();
 
                 m_Pets[pet->number] = pet;
@@ -2148 +2150 @@
                 if( itr->second->stablestate == STABLE_STATE_ACTIVE && itr->second->active )
                 {
-                        SpawnPet( itr->first );
+                        if( itr->second->alive )
+                                SpawnPet( itr->first );
                         return;
                 }

trunk/src/arcemu-world/Player.h

@@ -684 +684 @@
         uint32 xp;
         bool active;
+        bool alive;
         char stablestate;
         uint32 number;

trunk/src/arcemu-world/SpellEffects.cpp

@@ -4584 +4584 @@
                 if( petno )
                 {
-                        p_caster->SpawnPet(petno);
+                        if( p_caster->GetPlayerPet(petno)->alive )
+                        {
+                                p_caster->SpawnPet(petno);
+                        }
+                        else
+                        {
+                                SendTameFailure( PETTAME_DEAD );
+                        }
                 }
                 else
@@ -6671 +6678 @@
                 pPet->SendSpellsToOwner();
         }
+        else
+        {
+                
+                p_caster->SpawnPet( p_caster->GetUnstabledPetNumber() );
+                pPet = p_caster->GetSummon();
+                if(pPet == NULL)//no pets to Revive
+                        return;
+                if( GetProto()->SpellGroupType)
+                {
+                        SM_FIValue(p_caster->SM_FMiscEffect,&damage,GetProto()->SpellGroupType);
+                        SM_PIValue(p_caster->SM_PMiscEffect,&damage,GetProto()->SpellGroupType);
+                }
+                pPet->SetHealth((uint32)((pPet->GetMaxHealth() * damage) / 100));
+        }
 }