From 7a987524b80976e302bdba9b5655729a3b73165e Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Sun, 5 Dec 2021 18:33:59 -0300 Subject: [PATCH 1/2] fix unk -> unavailable; --- src/world/Network/Handlers/CommonListHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Network/Handlers/CommonListHandler.cpp b/src/world/Network/Handlers/CommonListHandler.cpp index ffe45450..e75c36f3 100644 --- a/src/world/Network/Handlers/CommonListHandler.cpp +++ b/src/world/Network/Handlers/CommonListHandler.cpp @@ -136,7 +136,7 @@ void Sapphire::Network::GameConnection::getCommonlistHandler( const Packets::FFX entry.HierarchyStatus = hierarchy.data.status; entry.HierarchyType = hierarchy.data.type; entry.HierarchyGroup = hierarchy.data.group; - entry.HierarchyUnk = hierarchy.data.unk; + entry.HierarchyUnk = hierarchy.data.unavailable; } entries.emplace_back( entry ); From 752c9904cecdf9856f5aaece04ffe0c2af2cd671 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Sun, 5 Dec 2021 20:08:21 -0300 Subject: [PATCH 2/2] add expansionlvl to lobby charlist; --- src/common/Network/PacketDef/Lobby/ServerLobbyDef.h | 3 ++- src/lobby/GameConnection.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h index 44b25f82..8fa99e91 100644 --- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h +++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h @@ -72,7 +72,8 @@ struct FFXIVIpcServiceLoginReply : FFXIVIpcBasePacket< ServiceLoginReply > /// ------------------------ uint16_t maxCreateCharacter; uint16_t maxCharacterList; - uint64_t unknown8; + uint32_t entitledExpansion; + uint32_t unknown8; CharacterInfo chrArray[2]; }; diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp index ce05d0be..8ca5fd5f 100644 --- a/src/lobby/GameConnection.cpp +++ b/src/lobby/GameConnection.cpp @@ -194,6 +194,7 @@ void Lobby::GameConnection::serviceLogin( FFXIVARR_PACKET_RAW& packet, uint32_t { charListPacket->data().maxCreateCharacter = Common::MAX_CREATE_CHARACTER; charListPacket->data().maxCharacterList = Common::MAX_CHARACTER_LIST; + charListPacket->data().entitledExpansion = Common::CURRENT_EXPANSION_ID; charListPacket->data().endOfList = 1; }