diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index b2fcab18..890b34d2 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3461,7 +3461,7 @@ void Human::CalcAssists(Human* target) void Human::SyncVolume(int slot_id) { - if (room->GetFrameNo() - join_frameno < SERVER_FRAME_RATE * 1) { + if (room->GetFrameNo() - join_frameno < SERVER_FRAME_RATE * 0.5) { return; } if (slot_id < 0) { @@ -3469,7 +3469,7 @@ void Human::SyncVolume(int slot_id) if (volume_[i] > 0) { room->xtimer.SetTimeoutEx ( - std::max(SERVER_FRAME_RATE * 6, i * 2), + NEXT_FRAME_TIMER, [this, i] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) { diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index f498eae4..2753bbd2 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -116,7 +116,7 @@ void Player::Initialize() } { room->xtimer.SetTimeoutEx - (SERVER_FRAME_RATE * 6, + (SERVER_FRAME_RATE * 1, [this] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) {