[Server] Only read Actor packets from players who are still authorities

apps/openmw-mp/Cell.cpp

@@ -155,6 +155,16 @@ void Cell::removeActors(const mwmp::BaseActorList *newActorList)
     cellActorList.count = cellActorList.baseActors.size();
 }
 
+RakNet::RakNetGUID *Cell::getAuthority()
+{
+    return &authorityGuid;
+}
+
+void Cell::setAuthority(const RakNet::RakNetGUID& guid)
+{
+    authorityGuid = guid;
+}
+
 mwmp::BaseActorList *Cell::getActorList()
 {
     return &cellActorList;

apps/openmw-mp/Cell.hpp

@@ -34,6 +34,9 @@ public:
     bool containsActor(int refNumIndex, int mpNum);
     mwmp::BaseActor *getActor(int refNumIndex, int mpNum);
     void removeActors(const mwmp::BaseActorList *newActorList);
+
+    RakNet::RakNetGUID *getAuthority();
+    void setAuthority(const RakNet::RakNetGUID& guid);
     mwmp::BaseActorList *getActorList();
 
     TPlayers getPlayers() const;
@@ -47,6 +50,7 @@ private:
     TPlayers players;
     ESM::Cell cell;
 
+    RakNet::RakNetGUID authorityGuid;
     mwmp::BaseActorList cellActorList;
 };
 

apps/openmw-mp/Script/Functions/Actors.cpp

@@ -232,15 +232,19 @@ void ActorFunctions::SendActorList() noexcept
 
 void ActorFunctions::SendActorAuthority() noexcept
 {
-    mwmp::ActorPacket *authorityPacket = mwmp::Networking::get().getActorPacketController()->GetPacket(ID_ACTOR_AUTHORITY);
-    authorityPacket->setActorList(&writeActorList);
-    authorityPacket->Send(writeActorList.guid);
-
-    // Also send this to everyone else who has the cell loaded
     Cell *serverCell = CellController::get()->getCell(&writeActorList.cell);
 
     if (serverCell != nullptr)
+    {
+        serverCell->setAuthority(writeActorList.guid);
+
+        mwmp::ActorPacket *authorityPacket = mwmp::Networking::get().getActorPacketController()->GetPacket(ID_ACTOR_AUTHORITY);
+        authorityPacket->setActorList(&writeActorList);
+        authorityPacket->Send(writeActorList.guid);
+
+        // Also send this to everyone else who has the cell loaded
         serverCell->sendToLoaded(authorityPacket, &writeActorList);
+    }
 }
 
 void ActorFunctions::SendActorPosition() noexcept

apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);
         }
     };

apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);
         }
     };

apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);
         }
     };

apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp

@@ -17,7 +17,7 @@ namespace mwmp
         {
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {
                 serverCell->removeActors(&actorList);
 

apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {
                 serverCell->readActorList(packetID, &actorList);
                 serverCell->sendToLoaded(&packet, &actorList);

apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
                 serverCell->sendToLoaded(&packet, &actorList);
         }
     };

apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp

@@ -18,7 +18,7 @@ namespace mwmp
             // Send only to players who have the cell loaded
             Cell *serverCell = CellController::get()->getCell(&actorList.cell);
 
-            if (serverCell != nullptr)
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
             {
                 serverCell->readActorList(packetID, &actorList);
                 serverCell->sendToLoaded(&packet, &actorList);