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

[Server] Send cell changes before position changes, and prioritize both

Browse source 
Previously, a script changing a player's cell and position at the same time would end up sending a position packet first and then a cell change packet that overrode the former, with the player ending up at the center of the destination cell instead of at the correct position.
This commit is contained in:
David Cernat 2017-11-19 00:59:32 +02:00
parent 80be664139
commit 4cc0216e0a
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw-mp/Player.cpp
View file

@ -123,6 +123,22 @@ void Player::update()
packet->Send(true); packet->Send(true);
} }
// Make sure we send a cell change before we send the position so the position isn't overridden
if (cellAPI.isChangedCell())
{
auto packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_CELL_CHANGE);
packet->setPlayer(this);
packet->Send(/*toOthers*/ false);
cellAPI.resetChangedCell();
}
if (positionChanged)
{
auto packet = plPCtrl->GetPacket(ID_PLAYER_POSITION);
packet->setPlayer(basePlayer);
packet->Send(false);
}
// The character class can override values from below on the client, so send it first // The character class can override values from below on the client, so send it first
cClass.update(); cClass.update();
@ -142,13 +158,6 @@ void Player::update()
packet->Send(true); packet->Send(true);
} }
if (positionChanged)
{
auto packet = plPCtrl->GetPacket(ID_PLAYER_POSITION);
packet->setPlayer(basePlayer);
packet->Send(false);
}
if (attributesChanged) if (attributesChanged)
{ {
auto packet = plPCtrl->GetPacket(ID_PLAYER_ATTRIBUTE); auto packet = plPCtrl->GetPacket(ID_PLAYER_ATTRIBUTE);
@ -190,20 +199,11 @@ void Player::update()
changedMap = false; changedMap = false;
} }
if (cellAPI.isChangedCell())
{
auto packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_CELL_CHANGE);
packet->setPlayer(this);
packet->Send(/*toOthers*/ false);
cellAPI.resetChangedCell();
}
settings.update(); settings.update();
books.update(); books.update();
gui.update(); gui.update();
dialogue.update(); dialogue.update();
factions.update(); factions.update();
cellAPI.update();
quests.update(); quests.update();
spells.update(); spells.update();