From 78e4779db6a01a289523704ca13ac91aec1f53da Mon Sep 17 00:00:00 2001
From: gsemaj <gsemaj@proton.me>
Date: Sun, 23 Jun 2024 21:04:43 -0700
Subject: [PATCH] Client synchronization improvements

---
 src/Buddies.cpp       | 11 +----------
 src/Buddies.hpp       |  2 +-
 src/Combat.cpp        |  4 ++++
 src/Player.hpp        |  2 +-
 src/PlayerManager.cpp | 36 +++++++++++++++++++++---------------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/Buddies.cpp b/src/Buddies.cpp
index e1e6a02..fc53551 100644
--- a/src/Buddies.cpp
+++ b/src/Buddies.cpp
@@ -30,7 +30,7 @@ static bool playerHasBuddyWithID(Player* plr, int buddyID) {
 #pragma endregion
 
 // Refresh buddy list
-void Buddies::refreshBuddyList(CNSocket* sock) {
+void Buddies::sendBuddyList(CNSocket* sock) {
     Player* plr = PlayerManager::getPlayer(sock);
     int buddyCnt = Database::getNumBuddies(plr);
 
@@ -277,15 +277,6 @@ static void reqFindNameBuddyAccept(CNSocket* sock, CNPacketData* data) {
 // Getting buddy state
 static void reqPktGetBuddyState(CNSocket* sock, CNPacketData* data) {
     Player* plr = PlayerManager::getPlayer(sock);
-
-    /*
-     * If the buddy list wasn't synced a second time yet, sync it.
-     * Not sure why we have to do it again for the client not to trip up.
-     */
-    if (!plr->buddiesSynced) {
-        refreshBuddyList(sock);
-        plr->buddiesSynced = true;
-    }
     
     INITSTRUCT(sP_FE2CL_REP_GET_BUDDY_STATE_SUCC, resp);
     
diff --git a/src/Buddies.hpp b/src/Buddies.hpp
index f0bc455..8ca4d87 100644
--- a/src/Buddies.hpp
+++ b/src/Buddies.hpp
@@ -6,5 +6,5 @@ namespace Buddies {
     void init();
 
     // Buddy list
-    void refreshBuddyList(CNSocket* sock);
+    void sendBuddyList(CNSocket* sock);
 }
diff --git a/src/Combat.cpp b/src/Combat.cpp
index 37565ee..1b29eb4 100644
--- a/src/Combat.cpp
+++ b/src/Combat.cpp
@@ -908,6 +908,10 @@ static void playerTick(CNServer *serv, time_t currTime) {
         Player *plr = pair.second;
         bool transmit = false;
 
+        // don't tick players that haven't loaded in yet
+        if (!plr->initialLoadDone)
+            continue;
+
         // group ticks
         if (plr->group != nullptr)
             Groups::groupTickInfo(sock);
diff --git a/src/Player.hpp b/src/Player.hpp
index 14019ab..edf9748 100644
--- a/src/Player.hpp
+++ b/src/Player.hpp
@@ -72,8 +72,8 @@ struct Player : public Entity, public ICombatant {
     bool notify = false;
     bool hidden = false;
     bool unwarpable = false;
+    bool initialLoadDone = false;
 
-    bool buddiesSynced = false;
     int64_t buddyIDs[50] = {};
     bool isBuddyBlocked[50] = {};
 
diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp
index f74cd4d..27d17e4 100644
--- a/src/PlayerManager.cpp
+++ b/src/PlayerManager.cpp
@@ -155,10 +155,8 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z) {
  * Nanos the player hasn't unlocked will (and should) be greyed out. Thus, all nanos should be accounted
  * for in these packets, even if the player hasn't unlocked them.
  */
-static void sendNanoBookSubset(CNSocket *sock) {
+static void sendNanoBookSubset(CNSocket *sock, Player *plr) {
 #ifdef ACADEMY
-    Player *plr = getPlayer(sock);
-
     int16_t id = 0;
     INITSTRUCT(sP_FE2CL_REP_NANO_BOOK_SUBSET, pkt);
 
@@ -294,27 +292,23 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
     sock->setFEKey(lm->FEKey);
     sock->setActiveKey(SOCKETKEY_FE); // send all packets using the FE key from now on
 
+    // Academy builds receive nanos in a separate packet. These need to be sent
+    // before P_FE2CL_REP_PC_ENTER_SUCC as well as after initial load
+    // due to a race condition in the client :(
+    sendNanoBookSubset(sock, plr);
+
     sock->sendPacket(response, P_FE2CL_REP_PC_ENTER_SUCC);
 
-    // transmit MOTD after entering the game, so the client hopefully changes modes on time
-    Chat::sendServerMessage(sock, settings::MOTDSTRING);
+    // Academy builds receive nanos separately. Need to send this ASAP after P_FE2CL_REP_PC_ENTER_SUCC
+    // because the client will fail to render equipped nanos if it's sent too late
+    
 
     // transfer ownership of Player object into the shard (still valid in this function though)
     addPlayer(sock, plr);
 
-    // check if there is an expiring vehicle
-    Items::checkItemExpire(sock, plr);
-
     // set player equip stats
     Items::setItemStats(plr);
 
-    Missions::failInstancedMissions(sock);
-
-    sendNanoBookSubset(sock);
-
-    // initial buddy sync
-    Buddies::refreshBuddyList(sock);
-
     for (auto& pair : players)
         if (pair.second->notify)
             Chat::sendServerMessage(pair.first, "[ADMIN]" + getPlayerName(plr) + " has joined.");
@@ -377,6 +371,18 @@ static void loadPlayer(CNSocket* sock, CNPacketData* data) {
 
         sock->sendPacket(pkt, P_FE2CL_INSTANCE_MAP_INFO);
     }
+
+    if (!plr->initialLoadDone) {
+        // these should be called only once, but not until after
+        // first load-in or else the client may ignore the packets
+        Chat::sendServerMessage(sock, settings::MOTDSTRING); // MOTD
+        Missions::failInstancedMissions(sock); // auto-fail missions
+        Buddies::sendBuddyList(sock); // buddy list
+        Items::checkItemExpire(sock, plr); // vehicle expiration
+        sendNanoBookSubset(sock, plr); // nanos (post-load)
+
+        plr->initialLoadDone = true;
+    }
 }
 
 static void heartbeatPlayer(CNSocket* sock, CNPacketData* data) {