etc/SuperMarioOdysseyOnline
0
0
Fork 0
mirror of https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git synced 2024-12-22 16:30:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from Istador/resend-packets

Browse source 
fix: `TagInf` and `CaptureInf` synchronization issues
This commit is contained in:
Jack Garrard 2023-08-25 18:51:28 -07:00 committed by GitHub
commit 8d94cf7856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/server/Client.hpp
View file

@ -225,6 +225,8 @@ class Client {
GameInf lastGameInfPacket = GameInf(); GameInf lastGameInfPacket = GameInf();
GameInf emptyGameInfPacket = GameInf(); GameInf emptyGameInfPacket = GameInf();
CostumeInf lastCostumeInfPacket = CostumeInf(); CostumeInf lastCostumeInfPacket = CostumeInf();
TagInf lastTagInfPacket = TagInf();
CaptureInf lastCaptureInfPacket = CaptureInf();
Keyboard* mKeyboard = nullptr; // keyboard for setting server IP Keyboard* mKeyboard = nullptr; // keyboard for setting server IP

18
source/server/Client.cpp
View file

@ -348,6 +348,10 @@ void Client::readFunc() {
mSocket->send(&lastPlayerInfPacket); mSocket->send(&lastPlayerInfPacket);
if (lastCostumeInfPacket.mUserID == mUserID) if (lastCostumeInfPacket.mUserID == mUserID)
mSocket->send(&lastCostumeInfPacket); mSocket->send(&lastCostumeInfPacket);
if (lastTagInfPacket.mUserID == mUserID)
mSocket->send(&lastTagInfPacket);
if (lastCaptureInfPacket.mUserID == mUserID)
mSocket->send(&lastCaptureInfPacket);
break; break;
case PacketType::COSTUMEINF: case PacketType::COSTUMEINF:
@ -616,6 +620,8 @@ void Client::sendTagInfPacket() {
packet->updateType = static_cast<TagUpdateType>(TagUpdateType::STATE | TagUpdateType::TIME); packet->updateType = static_cast<TagUpdateType>(TagUpdateType::STATE | TagUpdateType::TIME);
sInstance->mSocket->queuePacket(packet); sInstance->mSocket->queuePacket(packet);
sInstance->lastTagInfPacket = *packet;
} }
/** /**
@ -660,12 +666,14 @@ void Client::sendCaptureInfPacket(const PlayerActorHakoniwa* player) {
packet->mUserID = sInstance->mUserID; packet->mUserID = sInstance->mUserID;
strcpy(packet->hackName, tryConvertName(player->mHackKeeper->getCurrentHackName())); strcpy(packet->hackName, tryConvertName(player->mHackKeeper->getCurrentHackName()));
sInstance->mSocket->queuePacket(packet); sInstance->mSocket->queuePacket(packet);
sInstance->lastCaptureInfPacket = *packet;
sInstance->isSentCaptureInf = true; sInstance->isSentCaptureInf = true;
} else if (!sInstance->isClientCaptured && sInstance->isSentCaptureInf) { } else if (!sInstance->isClientCaptured && sInstance->isSentCaptureInf) {
CaptureInf *packet = new CaptureInf(); CaptureInf *packet = new CaptureInf();
packet->mUserID = sInstance->mUserID; packet->mUserID = sInstance->mUserID;
strcpy(packet->hackName, ""); strcpy(packet->hackName, "");
sInstance->mSocket->queuePacket(packet); sInstance->mSocket->queuePacket(packet);
sInstance->lastCaptureInfPacket = *packet;
sInstance->isSentCaptureInf = false; sInstance->isSentCaptureInf = false;
} }
} }
@ -683,6 +691,16 @@ void Client::resendInitPackets() {
if (lastGameInfPacket != emptyGameInfPacket) { if (lastGameInfPacket != emptyGameInfPacket) {
mSocket->queuePacket(&lastGameInfPacket); mSocket->queuePacket(&lastGameInfPacket);
} }
// TagInfPacket
if (lastTagInfPacket.mUserID == mUserID) {
mSocket->queuePacket(&lastTagInfPacket);
}
// CaptureInfPacket
if (lastCaptureInfPacket.mUserID == mUserID) {
mSocket->queuePacket(&lastCaptureInfPacket);
}
} }
/** /**

15
source/server/SocketClient.cpp
View file

@ -104,6 +104,21 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
// on a reconnect, resend some maybe missing packets // on a reconnect, resend some maybe missing packets
if (initPacket.conType == ConnectionTypes::RECONNECT) { if (initPacket.conType == ConnectionTypes::RECONNECT) {
client->resendInitPackets(); client->resendInitPackets();
} else {
// empty TagInf
TagInf tagInf;
tagInf.mUserID = initPacket.mUserID;
tagInf.isIt = false;
tagInf.minutes = 0;
tagInf.seconds = 0;
tagInf.updateType = static_cast<TagUpdateType>(TagUpdateType::STATE | TagUpdateType::TIME);
send(&tagInf);
// empty CaptureInf
CaptureInf capInf;
capInf.mUserID = initPacket.mUserID;
strcpy(capInf.hackName, "");
send(&capInf);
} }
return result; return result;