From a6630824f48accf2247eaff9cf2aed0fc6cbb02c Mon Sep 17 00:00:00 2001
From: thenecromancer <none@none>
Date: Sat, 30 Jan 2010 13:54:34 +0100
Subject: *Do not check for charminfo->petnumber when responding to Pet name
 query *Send Unknown if pet is not found by object accessor

--HG--
branch : trunk
---
 src/game/PetHandler.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/game/PetHandler.cpp')

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 1f46039571c..3b915423076 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -358,8 +358,16 @@ void WorldSession::HandlePetNameQuery( WorldPacket & recv_data )
 void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
 {
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, petguid);
-    if(!pet || !pet->GetCharmInfo() || pet->GetCharmInfo()->GetPetNumber() != petnumber)
+    if(!pet)
+    {
+        WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+4+name.size()+1));
+        data << uint32(petnumber);
+        data << "Unknown";
+        data << uint32(0);
+        data << uint8(0);
+        _player->GetSession()->SendPacket(&data);
         return;
+    }
 
     std::string name = pet->GetName();
 
-- 
cgit v1.2.3