diff options
| author | Meji <alvaromegias_46@hotmail.com> | 2021-10-16 00:48:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 00:48:54 +0200 |
| commit | 82b3a409db4dfe689c84234f3ae427369325bf0b (patch) | |
| tree | 3659688b099e811a4d263e647384508ed7bc3684 /src/server/game/Server | |
| parent | 518c86f9acd87d6597b2e236cfc3a773ee700fd3 (diff) | |
Core/BattlePets: Store declined names (#27025)
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/BattlePetPackets.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/BattlePetPackets.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Server/Packets/BattlePetPackets.cpp b/src/server/game/Server/Packets/BattlePetPackets.cpp index e241e985367..d1a7b9eebbf 100644 --- a/src/server/game/Server/Packets/BattlePetPackets.cpp +++ b/src/server/game/Server/Packets/BattlePetPackets.cpp @@ -116,13 +116,14 @@ void WorldPackets::BattlePet::BattlePetModifyName::Read() if (hasDeclinedNames) { + DeclinedName.emplace(); uint8 declinedNameLengths[MAX_DECLINED_NAME_CASES]; - for (uint8 i = 0; i < 5; ++i) + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) declinedNameLengths[i] = _worldPacket.ReadBits(7); - for (uint8 i = 0; i < 5; ++i) - Declined.name[i] = _worldPacket.ReadString(declinedNameLengths[i]); + for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + DeclinedName->name[i] = _worldPacket.ReadString(declinedNameLengths[i]); } Name = _worldPacket.ReadString(nameLength); diff --git a/src/server/game/Server/Packets/BattlePetPackets.h b/src/server/game/Server/Packets/BattlePetPackets.h index 9ad402a16fa..3dce500d0cc 100644 --- a/src/server/game/Server/Packets/BattlePetPackets.h +++ b/src/server/game/Server/Packets/BattlePetPackets.h @@ -133,7 +133,7 @@ namespace WorldPackets ObjectGuid PetGuid; std::string Name; - DeclinedName Declined; + Optional<DeclinedName> DeclinedName; }; class BattlePetDeletePet final : public ClientPacket |