From 9690e007df245c21c277216b92b23326a3d7d5f6 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 19 Sep 2016 11:06:04 +0300 Subject: [PATCH] Don't send unhandled skill and attribute requests to joining players --- apps/openmw-mp/Networking.cpp | 4 +--- apps/openmw/mwmp/Networking.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index 658a0b1f1..5af775a7d 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -122,7 +122,7 @@ void Networking::Update(RakNet::Packet *packet) return; } } - else if(packet->data[0] == ID_GAME_BASE_INFO) + else if (packet->data[0] == ID_GAME_BASE_INFO) { LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_GAME_BASE_INFO about %s", player->Npc()->mName.c_str()); @@ -352,8 +352,6 @@ void Networking::NewPlayer(RakNet::RakNetGUID guid) { controller->GetPacket(ID_GAME_BASE_INFO)->RequestData(guid); controller->GetPacket(ID_GAME_UPDATE_BASESTATS)->RequestData(guid); - controller->GetPacket(ID_GAME_ATTRIBUTE)->RequestData(guid); - controller->GetPacket(ID_GAME_SKILL)->RequestData(guid); controller->GetPacket(ID_GAME_UPDATE_POS)->RequestData(guid); controller->GetPacket(ID_GAME_CELL)->RequestData(guid); controller->GetPacket(ID_GAME_UPDATE_EQUIPED)->RequestData(guid); diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 5ce6b93bd..a3692e4d2 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -468,6 +468,9 @@ void Networking::ReceiveMessage(RakNet::Packet *packet) case ID_GAME_ATTRIBUTE: { + if (packet->length == myPacket->headerSize()) + return; + BasePlayer *__pl = nullptr; MWWorld::Ptr __pl_ptr; if (id == myid) @@ -497,6 +500,9 @@ void Networking::ReceiveMessage(RakNet::Packet *packet) case ID_GAME_SKILL: { + if (packet->length == myPacket->headerSize()) + return; + BasePlayer *__pl = nullptr; MWWorld::Ptr __pl_ptr; if (id == myid)