mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-20 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10651] Fixed combat log being bugged by pets without name

Browse source 
Signed-off-by: SilverIce <slifeleaf@gmail.com>
This commit is contained in:
nos4r2zod 2010-10-26 20:35:25 +03:00 • committed by SilverIce
parent 38e4a4936d
commit f483b41242
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/PetHandler.cpp
View file

@ -315,7 +315,15 @@ void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
{ {
Creature* pet = _player->GetMap()->GetAnyTypeCreature(petguid); Creature* pet = _player->GetMap()->GetAnyTypeCreature(petguid);
if(!pet || !pet->GetCharmInfo() || pet->GetCharmInfo()->GetPetNumber() != petnumber) if(!pet || !pet->GetCharmInfo() || pet->GetCharmInfo()->GetPetNumber() != petnumber)
{
WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+1+4+1));
data << uint32(petnumber);
data << uint8(0);
data << uint32(0);
data << uint8(0);
_player->GetSession()->SendPacket(&data);
return; return;
}
std::string name = pet->GetName(); std::string name = pet->GetName();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10650" #define REVISION_NR "10651"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__