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

[Server] Send level packets in Player's update() at the appropriate time

Browse source 
Previously, trying to send a level packet after base info and character class packets in a script actually led to the level packet being sent first and then being overridden by the others, with the player ending up at level 1 on their client.
This commit is contained in:
David Cernat 2017-11-18 03:55:17 +02:00
parent 494b10b97e
commit 57a0415ba3
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw-mp/NetActor.cpp
View file

@ -19,11 +19,12 @@ NetActor::NetActor() : inventory(this), cellAPI(this)
void NetActor::resetUpdateFlags()
{
baseInfoChanged = false;
levelChanged = false;
statsChanged = false;
positionChanged = false;
skillsChanged = false;
attributesChanged = false;
baseInfoChanged = false;
positionChanged = false;
}
std::tuple<float, float, float> NetActor::getPosition() const

2
apps/openmw-mp/NetActor.hpp
View file

@ -64,7 +64,7 @@ public:
mwmp::BaseNetCreature *getNetCreature() { return netCreature; }
protected:
bool statsChanged, attributesChanged, skillsChanged, baseInfoChanged, positionChanged;
bool baseInfoChanged, levelChanged, statsChanged, positionChanged, attributesChanged, skillsChanged;
mwmp::BasePlayer *basePlayer;
mwmp::BaseNetCreature *netCreature;

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

@ -123,6 +123,14 @@ void Player::update()
// The character class can override values from below on the client, so send it first
cClass.update();
if (levelChanged)
{
auto packet = plPCtrl->GetPacket(ID_PLAYER_LEVEL);
packet->setPlayer(basePlayer);
packet->Send(false);
packet->Send(true);
}
if (statsChanged)
{
auto packet = plPCtrl->GetPacket(ID_PLAYER_STATS_DYNAMIC);
@ -356,10 +364,7 @@ void Player::setIsMale(bool male)
void Player::setLevel(int level)
{
creatureStats.mLevel = level;
auto packet = mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_LEVEL);
packet->setPlayer(this);
packet->Send(false);
packet->Send(true);
levelChanged = true;
}
int Player::getLevel() const