luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-16 12:05:26 +01:00
Code Activity

Fix possible sendPlayerPos desync situation (#16498)

Browse Source
This commit is contained in:
sfan5
2025-10-15 00:21:07 +02:00
committed by GitHub
parent 7d4f80f1cc
commit c965bb77bd
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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();

1
src/client/client.h
View File

@@ -478,6 +478,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;