[Server] Move packet.Read() to parent

apps/openmw-mp/PlayerProcessor.cpp

@@ -32,6 +32,9 @@ bool PlayerProcessor::Process(RakNet::Packet &packet) noexcept
             PlayerPacket *myPacket = Networking::get().getPlayerController()->GetPacket(packet.data[0]);
             myPacket->setPlayer(player);
 
+            if(!processor.second->dontRead)
+                myPacket->Read();
+
             processor.second->Do(*myPacket, *player);
             return true;
         }

apps/openmw-mp/WorldProcessor.cpp

@@ -41,7 +41,8 @@ bool WorldProcessor::Process(RakNet::Packet &packet) noexcept
             LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s from %s", processor.second->strPacketID.c_str(),
                                player->npc.mName.c_str());
             myPacket->setEvent(&baseEvent);
-            myPacket->Read();
+            if(!processor.second->dontRead)
+                myPacket->Read();
             processor.second->Do(*myPacket, *player, baseEvent);
             return true;
         }

apps/openmw-mp/processors/player/ProcessorChatMsg.hpp

@@ -22,7 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
             Script::CallBackReturn<Script::CallbackIdentity("OnPlayerSendMessage")> result = true;
             Script::Call<Script::CallbackIdentity("OnPlayerSendMessage")>(result, player.getId(), player.chatMessage.c_str());
 

apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp

@@ -22,8 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-
             Script::Call<Script::CallbackIdentity("OnGUIAction")>(player.getId(), (int)player.guiMessageBox.id,
                                                                   player.guiMessageBox.data.c_str());
         }

apps/openmw-mp/processors/player/ProcessorLevel.hpp

@@ -22,9 +22,6 @@ namespace mwmp
         {
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
-                //packet.Send(&player, true);
-
                 Script::Call<Script::CallbackIdentity("OnPlayerLevelChange")>(player.getId());
             }
         }

apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp

@@ -26,8 +26,6 @@ namespace mwmp
 
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
-
                 Player *target = Players::getPlayer(player.attack.target);
 
                 if (target == nullptr)

apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp

@@ -22,7 +22,6 @@ namespace mwmp
         {
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
                 //myPacket->Send(player, true);
 
                 player.sendToLoaded(&packet);

apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp

@@ -28,8 +28,6 @@ namespace mwmp
 
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
-
                 LOG_APPEND(Log::LOG_INFO, "- Moved to %s", player.cell.getDescription().c_str());
 
                 player.forEachLoaded([this](Player *pl, Player *other) {

apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp

@@ -27,8 +27,6 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID, player.npc.mName.c_str());
 
-            packet.Read();
-
             CellController::get()->update(&player);
 
             Script::Call<Script::CallbackIdentity("OnPlayerCellState")>(player.getId());

apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp

@@ -21,8 +21,6 @@ namespace mwmp
         void Do(PlayerPacket &packet, Player &player) override
         {
             DEBUG_PRINTF(strPacketID.c_str());
-
-            packet.Read();
         }
     };
 }

apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp

@@ -22,8 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-
             if (player.charGenStage.current == player.charGenStage.end && player.charGenStage.current != 0)
                 Script::Call<Script::CallbackIdentity("OnPlayerEndCharGen")>(player.getId());
         }

apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp

@@ -17,6 +17,7 @@ namespace mwmp
         ProcessorPlayerDeath()
         {
             BPP_INIT(ID_PLAYER_DEATH)
+            dontRead = true;
         }
 
         void Do(PlayerPacket &packet, Player &player) override

apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp

@@ -22,9 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-            //packet.Send(&player, true);
-
             player.sendToLoaded(&packet);
         }
     };

apps/openmw-mp/processors/player/ProcessorPlayerDynamicStats.hpp

@@ -22,8 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-
             player.sendToLoaded(&packet);
         }
     };

apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp

@@ -22,9 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-            //myPacket->Send(player, true);
-
             player.sendToLoaded(&packet);
 
             Script::Call<Script::CallbackIdentity("OnPlayerEquipmentChange")>(player.getId());

apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp

@@ -21,8 +21,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-
             Script::Call<Script::CallbackIdentity("OnPlayerInventoryChange")>(player.getId());
         }
     };

apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp

@@ -22,8 +22,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
 
-            packet.Read();
-
             Script::Call<Script::CallbackIdentity("OnPlayerJournalChange")>(player.getId());
         }
     };

apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp

@@ -22,9 +22,6 @@ namespace mwmp
             //DEBUG_PRINTF(strPacketID);
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
-                //myPacket.Send(player, true); //send to other clients
-
                 player.sendToLoaded(&packet);
             }
         }

apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp

@@ -16,6 +16,7 @@ namespace mwmp
         ProcessorPlayerResurrect()
         {
             BPP_INIT(ID_PLAYER_RESURRECT)
+            dontRead = true;
         }
 
         void Do(PlayerPacket &packet, Player &player) override

apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp

@@ -21,7 +21,6 @@ namespace mwmp
         {
             if (!player.creatureStats.mDead)
             {
-                packet.Read();
                 //myPacket->Send(player, true);
                 player.sendToLoaded(&packet);
 

apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp

@@ -21,8 +21,6 @@ namespace mwmp
         {
             DEBUG_PRINTF(strPacketID.c_str());
             
-            packet.Read();
-
             Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player.getId());
         }
     };