*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 122 insertions, 0 deletions

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 78813453722..733a857373b 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -17,6 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -30,6 +31,7 @@
 #include "Util.h"
 #include "Pet.h"
 #include "World.h"
+
 void WorldSession::HandlePetAction( WorldPacket & recv_data )
 {
     uint64 guid1;
@@ -38,8 +40,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
     recv_data >> guid1;                                     //pet guid
     recv_data >> data;
     recv_data >> guid2;                                     //tag guid
+
     uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data);
     uint8 flag = UNIT_ACTION_BUTTON_TYPE(data);             //delete = 0x07 CastSpell = C1
+
     // used also for charmed creature
     Unit* pet= ObjectAccessor::GetUnit(*_player, guid1);
     sLog.outDetail("HandlePetAction.Pet %u flag is %u, spellid is %u, target %u.", uint32(GUID_LOPART(guid1)), uint32(flag), spellid, uint32(GUID_LOPART(guid2)) );
@@ -48,14 +52,17 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
         sLog.outError( "Pet %u not exist.", uint32(GUID_LOPART(guid1)) );
         return;
     }
+
     if(pet != GetPlayer()->GetFirstControlled())
     {
         sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() );
         return;
     }
+
     //TODO: allow control charmed player?
     if(pet->GetTypeId() == TYPEID_PLAYER && !(flag == ACT_COMMAND && spellid == COMMAND_ATTACK))
         return;
+
     if(GetPlayer()->m_Controlled.size() == 1)
         HandlePetActionHelper(pet, guid1, spellid, flag, guid2);
     else
@@ -69,6 +76,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
             HandlePetActionHelper(*itr, guid1, spellid, flag, guid2);
     }
 }
+
 void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2)
 {
     CharmInfo *charmInfo = pet->GetCharmInfo();
@@ -77,6 +85,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
         sLog.outError("WorldSession::HandlePetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
+
     switch(flag)
     {
         case ACT_COMMAND:                                   //0x07
@@ -87,6 +96,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     pet->InterruptNonMeleeSpells(false);
                     pet->GetMotionMaster()->MoveIdle();
                     charmInfo->SetCommandState( COMMAND_STAY );
+
                     charmInfo->SetIsCommandAttack(false);
                     charmInfo->SetIsAtStay(true);
                     charmInfo->SetIsFollowing(false);
@@ -98,6 +108,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     pet->InterruptNonMeleeSpells(false);
                     pet->GetMotionMaster()->MoveFollow(_player,PET_FOLLOW_DIST,pet->GetFollowAngle());
                     charmInfo->SetCommandState( COMMAND_FOLLOW );
+
                     charmInfo->SetIsCommandAttack(false);
                     charmInfo->SetIsAtStay(false);
                     charmInfo->SetIsReturning(true);
@@ -112,31 +123,40 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         //TODO: Send proper error message to client
                         return;
                     }
+
                     // only place where pet can be player
                     Unit *TargetUnit = ObjectAccessor::GetUnit(*_player, guid2);
                     if(!TargetUnit)
                         return;
+
                     if(!pet->canAttack(TargetUnit))
                         return;
+
                     // Not let attack through obstructions
                     if(sWorld.getConfig(CONFIG_PET_LOS))
                     {
+
                       if(!pet->IsWithinLOSInMap(TargetUnit))
                         return;
+
                     }
+                    
                     pet->clearUnitState(UNIT_STAT_FOLLOW);
                     // This is true if pet has no target or has target but targets differs.
                     if(pet->getVictim() != TargetUnit || ( pet->getVictim() == TargetUnit && !pet->GetCharmInfo()->IsCommandAttack() ))
                     {
                         if (pet->getVictim())
                             pet->AttackStop();
+
                         if(pet->GetTypeId() != TYPEID_PLAYER && ((Creature*)pet)->IsAIEnabled)
                         {
                             charmInfo->SetIsCommandAttack(true);
                             charmInfo->SetIsAtStay(false);
                             charmInfo->SetIsFollowing(false);
                             charmInfo->SetIsReturning(false);
+
                             ((Creature*)pet)->AI()->AttackStart(TargetUnit);
+
                             //10% chance to play special pet attack talk, else growl
                             if(((Creature*)pet)->isPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10)
                                 pet->SendPetTalk((uint32)PET_TALK_ATTACK);
@@ -150,10 +170,12 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         {
                             if(pet->getVictim() && pet->getVictim() != TargetUnit)
                                 pet->AttackStop();
+
                             charmInfo->SetIsCommandAttack(true);
                             charmInfo->SetIsAtStay(false);
                             charmInfo->SetIsFollowing(false);
                             charmInfo->SetIsReturning(false);
+
                             pet->Attack(TargetUnit,true);
                             pet->SendPetAIReaction(guid1);
                         }
@@ -189,6 +211,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             {
                 case REACT_PASSIVE:                         //passive
                     pet->AttackStop();
+
                 case REACT_DEFENSIVE:                       //recovery
                 case REACT_AGGRESSIVE:                      //activete
                     if(pet->GetTypeId() == TYPEID_UNIT)
@@ -203,8 +226,10 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             Unit* unit_target = NULL;
             if (((Creature*)pet)->GetGlobalCooldown() > 0)
                 return;
+
             if(guid2)
                 unit_target = ObjectAccessor::GetUnit(*_player,guid2);
+
             // do not cast unknown spells
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
             if(!spellInfo)
@@ -212,14 +237,17 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 sLog.outError("WORLD: unknown PET spell id %i", spellid);
                 return;
             }
+
             for(uint32 i = 0; i < 3;++i)
             {
                 if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_SRC || spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_DST || spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_DYNOBJ_ENEMY)
                     return;
             }
+
             // do not cast not learned spells
             if(!pet->HasSpell(spellid) || IsPassiveSpell(spellid))
                 return;
+
             //  Clear the flags as if owner clicked 'attack'. AI will reset them
             //  after AttackStart, even if spell failed
             if (pet->GetCharmInfo())
@@ -229,8 +257,11 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 pet->GetCharmInfo()->SetIsReturning(false);
                 pet->GetCharmInfo()->SetIsFollowing(false);
             }
+
             Spell *spell = new Spell(pet, spellInfo, false);
+
             SpellCastResult result = spell->CheckPetCast(unit_target);
+
             //auto turn to target unless possessed
             if(result == SPELL_FAILED_UNIT_NOT_INFRONT && !pet->isPossessed() && !pet->IsVehicle())
             {
@@ -251,10 +282,13 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         pet->SendUpdateToPlayer((Player*)powner);
                 result = SPELL_CAST_OK;
             }
+
             if(result == SPELL_CAST_OK)
             {
                 ((Creature*)pet)->AddCreatureSpellCooldown(spellid);
+
                 unit_target = spell->m_targets.getUnitTarget();
+
                 //10% chance to play special pet attack talk, else growl
                 //actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
                 if(((Creature*)pet)->isPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10))
@@ -263,6 +297,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 {
                     pet->SendPetAIReaction(guid1);
                 }
+
                 if( unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->isPossessed() && !pet->IsVehicle())
                 {
                     // This is true if pet has no target or has target but targets differs.
@@ -275,6 +310,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                             ((Creature*)pet)->AI()->AttackStart(unit_target);
                     }
                 }
+
                 spell->prepare(&(spell->m_targets));
             }
             else
@@ -283,10 +319,13 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     Spell::SendCastResult(GetPlayer(),spellInfo,0,result);
                 else
                     pet->SendPetCastFail(spellid, result);
+
                 if(!((Creature*)pet)->HasSpellCooldown(spellid))
                     GetPlayer()->SendClearCooldown(spellid, pet);
+
                 spell->finish(false);
                 delete spell;
+
                 // reset specific flags in case of spell fail. AI will reset other flags
                 if (pet->GetCharmInfo())
                     pet->GetCharmInfo()->SetIsCommandAttack(false);
@@ -297,25 +336,33 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
     }
 }
+
 void WorldSession::HandlePetNameQuery( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetNameQuery. CMSG_PET_NAME_QUERY" );
+
     uint32 petnumber;
     uint64 petguid;
+
     recv_data >> petnumber;
     recv_data >> petguid;
+
     SendPetNameQuery(petguid,petnumber);
 }
+
 void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
 {
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, petguid);
     if(!pet || !pet->GetCharmInfo() || pet->GetCharmInfo()->GetPetNumber() != petnumber)
         return;
+
     std::string name = pet->GetName();
+
     WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+4+name.size()+1));
     data << uint32(petnumber);
     data << name.c_str();
     data << uint32(pet->GetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP));
+
     if( pet->isPet() && ((Pet*)pet)->GetDeclinedNames() )
     {
         data << uint8(1);
@@ -324,39 +371,52 @@ void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
     }
     else
         data << uint8(0);
+
     _player->GetSession()->SendPacket(&data);
 }
+
 void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetSetAction. CMSG_PET_SET_ACTION" );
+
     uint64 petguid;
     uint8  count;
+
     recv_data >> petguid;
+
     Unit* pet = ObjectAccessor::GetUnit(*_player, petguid);
+
     if(!pet || pet != _player->GetFirstControlled())
     {
         sLog.outError( "HandlePetSetAction: Unknown pet or pet owner." );
         return;
     }
+
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
         sLog.outError("WorldSession::HandlePetSetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
+
     count = (recv_data.size() == 24) ? 2 : 1;
     for(uint8 i = 0; i < count; ++i)
     {
         uint32 position;
         uint32 data;
+
         recv_data >> position;
         recv_data >> data;
+
         uint32 spell_id = UNIT_ACTION_BUTTON_ACTION(data);
         uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data);
+
         sLog.outDetail( "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X", _player->GetName(), position, spell_id, uint32(act_state));
+
         //ignore invalid position
         if(position >= MAX_UNIT_ACTION_BAR_INDEX)
             return;
+
         //if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add
         if(!((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && !pet->HasSpell(spell_id)))
         {
@@ -375,49 +435,63 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
                     ((Pet*)pet)->ToggleAutocast(spell_id, false);
                 else
                     charmInfo->ToggleCreatureAutocast(spell_id, false);
+
             }
+
             charmInfo->SetActionBar(position,spell_id,ActiveStates(act_state));
         }
     }
 }
+
 void WorldSession::HandlePetRename( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetRename. CMSG_PET_RENAME" );
+
     uint64 petguid;
     uint8 isdeclined;
+
     std::string name;
     DeclinedName declinedname;
+
     recv_data >> petguid;
     recv_data >> name;
     recv_data >> isdeclined;
+
     Pet* pet = ObjectAccessor::GetPet(petguid);
                                                             // check it!
     if( !pet || !pet->isPet() || ((Pet*)pet)->getPetType()!= HUNTER_PET ||
         pet->GetByteValue(UNIT_FIELD_BYTES_2, 2) != UNIT_RENAME_ALLOWED ||
         pet->GetOwnerGUID() != _player->GetGUID() || !pet->GetCharmInfo() )
         return;
+
     PetNameInvalidReason res = ObjectMgr::CheckPetName(name);
     if(res != PET_NAME_SUCCESS)
     {
         SendPetNameInvalid(res, name, NULL);
         return;
     }
+
     if(objmgr.IsReservedName(name))
     {
         SendPetNameInvalid(PET_NAME_RESERVED, name, NULL);
         return;
     }
+
     pet->SetName(name);
+
     Unit *owner = pet->GetOwner();
     if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
         ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_NAME);
+
     pet->SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_NOT_ALLOWED);
+
     if(isdeclined)
     {
         for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         {
             recv_data >> declinedname.name[i];
         }
+
         std::wstring wname;
         Utf8toWStr(name, wname);
         if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname,0),declinedname))
@@ -426,6 +500,7 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data )
             return;
         }
     }
+
     CharacterDatabase.BeginTransaction();
     if(isdeclined)
     {
@@ -435,18 +510,23 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data )
         CharacterDatabase.PExecute("INSERT INTO character_pet_declinedname (id, owner, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%u','%s','%s','%s','%s','%s')",
             pet->GetCharmInfo()->GetPetNumber(), _player->GetGUIDLow(), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
     }
+
     CharacterDatabase.escape_string(name);
     CharacterDatabase.PExecute("UPDATE character_pet SET name = '%s', renamed = '1' WHERE owner = '%u' AND id = '%u'", name.c_str(), _player->GetGUIDLow(), pet->GetCharmInfo()->GetPetNumber());
     CharacterDatabase.CommitTransaction();
+
     pet->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
 }
+
 void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;                                      //pet guid
     sLog.outDetail( "HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid) );
+
     if(!_player->IsInWorld())
         return;
+
     // pet/charmed
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
     if(pet)
@@ -458,25 +538,31 @@ void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
                 uint32 feelty = pet->GetPower(POWER_HAPPINESS);
                 pet->SetPower(POWER_HAPPINESS ,(feelty-50000) > 0 ?(feelty-50000) : 0);
             }
+
             _player->RemovePet((Pet*)pet,PET_SAVE_AS_DELETED);
         }
         else if(pet->GetGUID() == _player->GetCharmGUID())
             _player->StopCastingCharm();
     }
 }
+
 void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
 {
     sLog.outDetail("CMSG_PET_UNLEARN");
     uint64 guid;
     recvPacket >> guid;                 // Pet guid
+
     Pet* pet = _player->GetPet();
+
     if(!pet || pet->getPetType() != HUNTER_PET || pet->m_usedTalentCount == 0)
         return;
+
     if(guid != pet->GetGUID())
     {
         sLog.outError( "HandlePetUnlearnOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
+
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
@@ -486,6 +572,7 @@ void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
     pet->resetTalents();
     _player->SendTalentsInfoData(true);
 }
+
 void WorldSession::HandlePetSpellAutocastOpcode( WorldPacket& recvPacket )
 {
     sLog.outDetail("CMSG_PET_SPELL_AUTOCAST");
@@ -493,71 +580,93 @@ void WorldSession::HandlePetSpellAutocastOpcode( WorldPacket& recvPacket )
     uint32 spellid;
     uint8  state;                                           //1 for on, 0 for off
     recvPacket >> guid >> spellid >> state;
+
     if(!_player->GetGuardianPet() && !_player->GetCharm())
         return;
+
     if(ObjectAccessor::FindPlayer(guid))
         return;
+
     Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player,guid);
+
     if(!pet || (pet != _player->GetGuardianPet() && pet != _player->GetCharm()))
     {
         sLog.outError( "HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
+
     // do not add not learned spells/ passive spells
     if(!pet->HasSpell(spellid) || IsAutocastableSpell(spellid))
         return;
+
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
         sLog.outError("WorldSession::HandlePetSpellAutocastOpcod: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
+
     if(pet->isPet())
         ((Pet*)pet)->ToggleAutocast(spellid, state);
     else
         pet->GetCharmInfo()->ToggleCreatureAutocast(spellid, state);
+
     charmInfo->SetSpellAutocast(spellid,state);
 }
+
 void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
 {
     sLog.outDetail("WORLD: CMSG_PET_CAST_SPELL");
+
     uint64 guid;
     uint32 spellid;
     uint8  cast_count;
     uint8  unk_flags;                                       // flags (if 0x02 - some additional data are received)
+
     recvPacket >> guid >> cast_count >> spellid >> unk_flags;
+
     sLog.outDebug("WORLD: CMSG_PET_CAST_SPELL, cast_count: %u, spellid %u, unk_flags %u", cast_count, spellid, unk_flags);
+
     // This opcode is also sent from charmed and possessed units (players and creatures)
     if(!_player->GetGuardianPet() && !_player->GetCharm())
         return;
+
     Unit* caster = ObjectAccessor::GetUnit(*_player, guid);
+
     if(!caster || (caster != _player->GetGuardianPet() && caster != _player->GetCharm()))
     {
         sLog.outError( "HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
+
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
     if(!spellInfo)
     {
         sLog.outError("WORLD: unknown PET spell id %i", spellid);
         return;
     }
+
     if (spellInfo->StartRecoveryCategory > 0) //Check if spell is affected by GCD
         if (caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->GetGlobalCooldown() > 0)
         {
             caster->SendPetCastFail(spellid, SPELL_FAILED_NOT_READY);
             return;
         }
+
     // do not cast not learned spells
     if(!caster->HasSpell(spellid) || IsPassiveSpell(spellid))
         return;
+
     SpellCastTargets targets;
     if(!targets.read(&recvPacket,caster))
         return;
+
     caster->clearUnitState(UNIT_STAT_FOLLOW);
+
     Spell *spell = new Spell(caster, spellInfo, spellid == 33395); // water elemental can cast freeze as triggered
     spell->m_cast_count = spellid == 33395 ? 0 : cast_count;                       // probably pending spell cast
     spell->m_targets = targets;
+
     // TODO: need to check victim?
     SpellCastResult result;
     if(caster->m_movedPlayer)
@@ -581,6 +690,7 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
                     pet->SendPetAIReaction(guid);
             }
         }
+
         spell->prepare(&(spell->m_targets));
     }
     else
@@ -596,10 +706,12 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
             if(!((Creature*)caster)->HasSpellCooldown(spellid))
                 GetPlayer()->SendClearCooldown(spellid, caster);
         }
+
         spell->finish(false);
         delete spell;
     }
 }
+
 void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName)
 {
     WorldPacket data(SMSG_PET_NAME_INVALID, 4 + name.size() + 1 + 1);
@@ -615,27 +727,37 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
         data << uint8(0);
     SendPacket(&data);
 }
+
 void WorldSession::HandlePetLearnTalent( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_PET_LEARN_TALENT");
+
     uint64 guid;
     uint32 talent_id, requested_rank;
     recv_data >> guid >> talent_id >> requested_rank;
+
     _player->LearnPetTalent(guid, talent_id, requested_rank);
     _player->SendTalentsInfoData(true);
 }
+
 void WorldSession::HandleLearnPreviewTalentsPet( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_LEARN_PREVIEW_TALENTS_PET");
+
     uint64 guid;
     recv_data >> guid;
+
     uint32 talentsCount;
     recv_data >> talentsCount;
+
     uint32 talentId, talentRank;
+
     for(uint32 i = 0; i < talentsCount; ++i)
     {
         recv_data >> talentId >> talentRank;
+
         _player->LearnPetTalent(guid, talentId, talentRank);
     }
+
     _player->SendTalentsInfoData(true);
 }