From 02244211c486e72fb32bbc10d3210caab072b10a Mon Sep 17 00:00:00 2001
From: goaaats <fakecake@icloud.com>
Date: Sat, 7 Jul 2018 14:06:10 +0200
Subject: [PATCH 1/2] Correctly initialize m_targetId in Chara

---
 src/servers/sapphire_zone/Actor/Chara.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index 64a673d3..4fbc8716 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -34,7 +34,8 @@ using namespace Core::Network::Packets::Server;
 using namespace Core::Network::ActorControl;
 
 Core::Entity::Chara::Chara( ObjKind type ) :
-   Actor( type )
+   Actor( type ),
+   m_targetId( INVALID_GAME_OBJECT_ID )
 {
    // initialize the free slot queue
    for( uint8_t i = 0; i < MAX_STATUS_EFFECTS; i++ )

From f961b962ed9bb2b8f6e08c596c19c82f74b9298d Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Sat, 7 Jul 2018 15:22:22 +0100
Subject: [PATCH 2/2] fixed lobby not showing multiple characters - updated
 initui for player commendations

---
 .../Network/PacketDef/Lobby/ServerLobbyDef.h       |  2 +-
 src/common/Network/PacketDef/Zone/ServerZoneDef.h  | 14 ++++++++------
 src/servers/sapphire_lobby/GameConnection.cpp      |  1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index a414fb3b..92d1f304 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -91,7 +91,7 @@ struct FFXIVIpcCharList : FFXIVIpcBasePacket<LobbyCharList>
       char nameChara[32];
       char nameServer[32];
       char nameServer1[32];
-      char charDetailJson[1030];
+      char charDetailJson[1028];
    } charaDetails[2];
 
 };
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d04a06f7..dedc5058 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -624,18 +624,20 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
    unsigned short pvpWolfFoldWeeklyMatches;
    unsigned short pvpWolfFoldWeeklyVictories;
    unsigned short pvpStats[6];
-   unsigned short playerCommendations;
+   unsigned short unknown74;
    unsigned short pvpStats1;
    unsigned char frontlineCampaigns[4];
    unsigned short frontlineCampaignsWeekly;
    unsigned char currentRelic;
    unsigned char currentBook;
    unsigned char masterCrafterMask;
-   unsigned char unknown69;
-   unsigned char unknown6A;
-   unsigned char unknown6B;
-   unsigned char unknown6C[4];
-   unsigned char unknown70[34];
+   unsigned char unknown81;
+   unsigned char unknown82;
+   unsigned char unknown83;
+   unsigned char unknown84[4];
+   unsigned char unknown88[10];
+   unsigned short playerCommendations;
+   unsigned char unknown94[22];
    unsigned short unknown18;
    unsigned char maxLevel;
    unsigned char expansion;
diff --git a/src/servers/sapphire_lobby/GameConnection.cpp b/src/servers/sapphire_lobby/GameConnection.cpp
index c5cc7ed0..72e60013 100644
--- a/src/servers/sapphire_lobby/GameConnection.cpp
+++ b/src/servers/sapphire_lobby/GameConnection.cpp
@@ -191,7 +191,6 @@ void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, ui
          charListPacket->data().counter = ( i * 4 ) + 1;
          charListPacket->data().unknown4 = 128;
       }
-
       Packets::LobbyPacketContainer pRP( m_encKey );
       pRP.addPacket( charListPacket );
       sendPacket( pRP );