oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Fix possible sendPlayerPos desync situation

Browse source
This commit is contained in:
sfan5 2025-09-18 16:57:34 +02:00
parent 29490cb0f7
commit d5cb25206c
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/client/client.cpp
View file

@ -566,9 +566,8 @@ void Client::step(float dtime)
{ {
float &counter = m_playerpos_send_timer; float &counter = m_playerpos_send_timer;
counter += dtime; counter += dtime;
if((m_state == LC_Ready) && (counter >= m_recommended_send_interval)) if (m_state == LC_Ready && counter >= m_recommended_send_interval) {
{ counter = 0;
counter = 0.0;
sendPlayerPos(); sendPlayerPos();
} }
} }
@ -1403,7 +1402,7 @@ void Client::sendPlayerPos()
f32 movement_speed = player->control.movement_speed; f32 movement_speed = player->control.movement_speed;
f32 movement_dir = player->control.movement_direction; f32 movement_dir = player->control.movement_direction;
if ( bool identical = (
player->last_position == player->getPosition() && player->last_position == player->getPosition() &&
player->last_speed == player->getSpeed() && player->last_speed == player->getSpeed() &&
player->last_pitch == player->getPitch() && player->last_pitch == player->getPitch() &&
@ -1413,8 +1412,19 @@ void Client::sendPlayerPos()
player->last_camera_inverted == camera_inverted && player->last_camera_inverted == camera_inverted &&
player->last_wanted_range == wanted_range && player->last_wanted_range == wanted_range &&
player->last_movement_speed == movement_speed && player->last_movement_speed == movement_speed &&
player->last_movement_dir == movement_dir) player->last_movement_dir == movement_dir);
if (identical) {
// Since the movement info is sent non-reliable an unfortunate desync might
// occur if we stop sending and the last packet gets lost or re-ordered.
// To make this situation less likely we stop sending duplicate packets
// only after a delay.
m_playerpos_repeat_count++;
if (m_playerpos_repeat_count >= 5)
return; return;
} else {
m_playerpos_repeat_count = 0;
}
player->last_position = player->getPosition(); player->last_position = player->getPosition();
player->last_speed = player->getSpeed(); player->last_speed = player->getSpeed();
@ -1778,7 +1788,8 @@ float Client::mediaReceiveProgress()
return 1.0; // downloader only exists when not yet done return 1.0; // downloader only exists when not yet done
} }
void Client::drawLoadScreen(const std::wstring &text, float dtime, int percent) { void Client::drawLoadScreen(const std::wstring &text, float dtime, int percent)
{
m_rendering_engine->run(); m_rendering_engine->run();
m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, dtime, percent); m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, dtime, percent);
} }

1
src/client/client.h
View file

@ -476,6 +476,7 @@ private:
float m_connection_reinit_timer = 0.1f; float m_connection_reinit_timer = 0.1f;
float m_avg_rtt_timer = 0.0f; float m_avg_rtt_timer = 0.0f;
float m_playerpos_send_timer = 0.0f; float m_playerpos_send_timer = 0.0f;
int m_playerpos_repeat_count = 0;
IntervalLimiter m_map_timer_and_unload_interval; IntervalLimiter m_map_timer_and_unload_interval;
IWritableTextureSource *m_tsrc; IWritableTextureSource *m_tsrc;