From 596bf2b77218e6b959c1bf7de848c6f09d5a91f0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 23 Jan 2022 20:31:52 +0100 Subject: Core/Misc: Replace boost::optional with std::optional part 2 --- src/server/game/Handlers/PetHandler.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/server/game/Handlers/PetHandler.cpp') diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index df0765e5067..95cde9901d2 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -530,7 +530,7 @@ void WorldSession::HandlePetRename(WorldPackets::Pet::PetRename& packet) ObjectGuid petguid = packet.RenameData.PetGUID; std::string name = packet.RenameData.NewName; - DeclinedName* declinedname = packet.RenameData.DeclinedNames.get_ptr(); + Optional const& declinedname = packet.RenameData.DeclinedNames; Pet* pet = ObjectAccessor::GetPet(*_player, petguid); // check it! @@ -542,13 +542,13 @@ void WorldSession::HandlePetRename(WorldPackets::Pet::PetRename& packet) PetNameInvalidReason res = ObjectMgr::CheckPetName(name); if (res != PET_NAME_SUCCESS) { - SendPetNameInvalid(res, name, nullptr); + SendPetNameInvalid(res, name, {}); return; } if (sObjectMgr->IsReservedName(name)) { - SendPetNameInvalid(PET_NAME_RESERVED, name, nullptr); + SendPetNameInvalid(PET_NAME_RESERVED, name, {}); return; } @@ -751,13 +751,12 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPackets::Spells::PetCastSpell& } } -void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName) +void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Optional const& declinedName) { WorldPackets::Pet::PetNameInvalid petNameInvalid; petNameInvalid.Result = error; petNameInvalid.RenameData.NewName = name; - if (declinedName) - petNameInvalid.RenameData.DeclinedNames = *declinedName; + petNameInvalid.RenameData.DeclinedNames = declinedName; SendPacket(petNameInvalid.Write()); } -- cgit v1.2.3