diff options
| -rw-r--r-- | src/server/game/BattlePets/BattlePetMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/BattlePetHandler.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/BattlePets/BattlePetMgr.cpp b/src/server/game/BattlePets/BattlePetMgr.cpp index 54b4282e40e..811361d223a 100644 --- a/src/server/game/BattlePets/BattlePetMgr.cpp +++ b/src/server/game/BattlePets/BattlePetMgr.cpp @@ -446,7 +446,7 @@ void BattlePetMgr::ModifyName(ObjectGuid guid, std::string const& name, Declined return; pet->PacketInfo.Name = name; - pet->NameTimestamp = !pet->PacketInfo.Name.empty() ? GameTime::GetGameTime() : time_t(0); + pet->NameTimestamp = GameTime::GetGameTime(); pet->DeclinedName.reset(); if (declinedName) diff --git a/src/server/game/Handlers/BattlePetHandler.cpp b/src/server/game/Handlers/BattlePetHandler.cpp index 4332931795c..a0a7afe1fb4 100644 --- a/src/server/game/Handlers/BattlePetHandler.cpp +++ b/src/server/game/Handlers/BattlePetHandler.cpp @@ -76,7 +76,6 @@ void WorldSession::HandleQueryBattlePetName(WorldPackets::BattlePet::QueryBattle return; } - response.Allow = true; response.Name = battlePet->PacketInfo.Name; if (battlePet->DeclinedName) { @@ -84,6 +83,8 @@ void WorldSession::HandleQueryBattlePetName(WorldPackets::BattlePet::QueryBattle response.DeclinedNames = *battlePet->DeclinedName; } + response.Allow = !response.Name.empty(); + SendPacket(response.Write()); } |