teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

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

Browse source
This commit is contained in:
David Cernat 2017-05-05 06:13:34 +03:00
parent 206c9cc357
commit 06f3c07116
10 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw-mp/Cell.cpp
View file

@ -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;

4
apps/openmw-mp/Cell.hpp
View file

@ -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;
};

14
apps/openmw-mp/Script/Functions/Actors.cpp
View file

@ -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

2
apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp
View file

@ -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);
}
};

2
apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp
View file

@ -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);
}
};

2
apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp
View file

@ -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);
}
};

2
apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp
View file

@ -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);

2
apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp
View file

@ -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);

2
apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp
View file

@ -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);
}
};

2
apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp
View file

@ -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);