diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-05-10 13:09:59 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-05-10 13:09:59 +0200 |
| commit | 3b95d3dcf95caa6df3f5b7897e8b29dbb1cb58e3 (patch) | |
| tree | fe6ed60e3a9cb43f847a6adee6ed7a981e5f67fc /src/server/game/Server/Packets | |
| parent | 5081b0c4993a261cbef7840846e78127a20d87e4 (diff) | |
Core/PacketIO: Fixed SMSG_GUILD_EVENT for empty MOTD broken after cd28423a4e813baf6833f38c93613a7f82a721f8
Closes #26522
Diffstat (limited to 'src/server/game/Server/Packets')
| -rw-r--r-- | src/server/game/Server/Packets/GuildPackets.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GuildPackets.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index 1cc7e23a062..30cc4c941b9 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -122,10 +122,9 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Guild::GuildRosterMemberD WorldPacket const* WorldPackets::Guild::GuildEvent::Write() { _worldPacket << uint8(Type); - uint8 paramCount = Params[2].empty() ? (Params[1].empty() ? (Params[0].empty() ? 0 : 1) : 2) : 3; - _worldPacket << uint8(paramCount); - for (uint8 i = 0; i < paramCount; ++i) - _worldPacket << Params[i]; + _worldPacket << uint8(Params.size()); + for (std::string_view param : Params) + _worldPacket << param; switch (Type) { diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index 44796c422da..6815b936531 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -22,6 +22,7 @@ #include "Guild.h" #include "ObjectGuid.h" #include "PacketUtilities.h" +#include <boost/container/static_vector.hpp> #include <array> namespace WorldPackets @@ -207,7 +208,7 @@ namespace WorldPackets WorldPacket const* Write() override; uint8 Type = 0; - std::array<std::string_view, 3> Params = { }; + boost::container::static_vector<std::string_view, 3> Params; ObjectGuid Guid; }; |