Merge b0e2391f24 into 47dbc6d35e

src/PlayerManager.cpp

@@ -294,14 +294,12 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
     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
+    // 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);
 
-    sendNanoBookSubset(sock, plr);
-
     // transfer ownership of Player object into the shard (still valid in this function though)
     addPlayer(sock, plr);
 
@@ -378,6 +376,7 @@ static void loadPlayer(CNSocket* sock, CNPacketData* data) {
         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;
     }