OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't send unnecessary nano book subsets pre-enter

Browse Source
This commit is contained in:
gsemaj 2024-06-26 15:15:11 -07:00
parent 1781ac6b03
commit f436108d24
No known key found for this signature in database
GPG Key ID: 24B96BAA40497929
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/PlayerManager.cpp
View File

@ -155,7 +155,7 @@ 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 * 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. * for in these packets, even if the player hasn't unlocked them.
*/ */
static void sendNanoBookSubset(CNSocket *sock, Player *plr) { static void sendNanoBook(CNSocket *sock, Player *plr, bool resizeOnly) {
#ifdef ACADEMY #ifdef ACADEMY
int16_t id = 0; int16_t id = 0;
INITSTRUCT(sP_FE2CL_REP_NANO_BOOK_SUBSET, pkt); INITSTRUCT(sP_FE2CL_REP_NANO_BOOK_SUBSET, pkt);
@ -163,6 +163,13 @@ static void sendNanoBookSubset(CNSocket *sock, Player *plr) {
pkt.PCUID = plr->iID; pkt.PCUID = plr->iID;
pkt.bookSize = NANO_COUNT; pkt.bookSize = NANO_COUNT;
if (resizeOnly) {
// triggers nano array resizing without
// actually sending nanos
sock->sendPacket(pkt, P_FE2CL_REP_NANO_BOOK_SUBSET);
return;
}
while (id < NANO_COUNT) { while (id < NANO_COUNT) {
pkt.elementOffset = id; pkt.elementOffset = id;
@ -295,11 +302,11 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
// Academy builds receive nanos in a separate packet. These need to be sent // 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
// due to a race condition in the client :( // due to a race condition in the client :(
sendNanoBookSubset(sock, plr); sendNanoBook(sock, plr, true);
sock->sendPacket(response, P_FE2CL_REP_PC_ENTER_SUCC); sock->sendPacket(response, P_FE2CL_REP_PC_ENTER_SUCC);
sendNanoBookSubset(sock, plr); sendNanoBook(sock, plr, false);
// transfer ownership of Player object into the shard (still valid in this function though) // transfer ownership of Player object into the shard (still valid in this function though)
addPlayer(sock, plr); addPlayer(sock, plr);