diff options
| -rw-r--r-- | src/server/game/Server/Packets/SystemPackets.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/SystemPackets.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/server/game/Server/Packets/SystemPackets.cpp b/src/server/game/Server/Packets/SystemPackets.cpp index c3cb9594973..b2f97c95063 100644 --- a/src/server/game/Server/Packets/SystemPackets.cpp +++ b/src/server/game/Server/Packets/SystemPackets.cpp @@ -229,10 +229,8 @@ WorldPacket const* FeatureSystemStatusGlueScreen::Write() _worldPacket.WriteBit(Unused1000); _worldPacket.WriteBit(AccountSaveDataExportEnabled); _worldPacket.WriteBit(AccountLockedByExport); - _worldPacket.WriteBit(RealmHiddenAlert.has_value()); - if (RealmHiddenAlert) - _worldPacket.WriteBits(RealmHiddenAlert->length() + 1, 11); + _worldPacket.WriteBits(RealmHiddenAlert.length() + 1, 11); _worldPacket.FlushBits(); @@ -263,8 +261,8 @@ WorldPacket const* FeatureSystemStatusGlueScreen::Write() if (LaunchETA) _worldPacket << int32(*LaunchETA); - if (RealmHiddenAlert && !RealmHiddenAlert->empty()) - _worldPacket.WriteString(*RealmHiddenAlert); + if (!RealmHiddenAlert.empty()) + _worldPacket << RealmHiddenAlert; if (!LiveRegionCharacterCopySourceRegions.empty()) _worldPacket.append(LiveRegionCharacterCopySourceRegions.data(), LiveRegionCharacterCopySourceRegions.size()); diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h index d130efbdef6..4a326f33206 100644 --- a/src/server/game/Server/Packets/SystemPackets.h +++ b/src/server/game/Server/Packets/SystemPackets.h @@ -241,7 +241,7 @@ namespace WorldPackets std::vector<DebugTimeEventInfo> DebugTimeEvents; int32 Unused1007 = 0; uint32 EventRealmQueues = 0; - Optional<std::string> RealmHiddenAlert; + std::string RealmHiddenAlert; }; class SetTimeZoneInformation final : public ServerPacket |