diff options
author | metamuffin <metamuffin@disroot.org> | 2024-06-26 16:53:07 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-06-26 16:53:07 +0200 |
commit | 2ca6ac7ab329036d0155de2de4b0a11f3a785414 (patch) | |
tree | 7472368efb282a4380b45931f3462e9930f48a36 /server/src/game.rs | |
parent | c4b0f8d698b574c711b1e205371adfd3e3339487 (diff) | |
download | hurrycurry-2ca6ac7ab329036d0155de2de4b0a11f3a785414.tar hurrycurry-2ca6ac7ab329036d0155de2de4b0a11f3a785414.tar.bz2 hurrycurry-2ca6ac7ab329036d0155de2de4b0a11f3a785414.tar.zst |
boosting
Diffstat (limited to 'server/src/game.rs')
-rw-r--r-- | server/src/game.rs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/server/src/game.rs b/server/src/game.rs index 595816e1..20f479c7 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -16,7 +16,7 @@ */ use crate::{ - customer::{movement::PLAYER_SPEED_LIMIT, DemandState}, + customer::DemandState, data::Gamedata, interaction::{interact, tick_tile, InteractEffect, TickEffect}, protocol::{ItemIndex, Message, PacketC, PacketS, PlayerID, RecipeIndex, TileIndex}, @@ -244,29 +244,29 @@ impl Game { .get_mut(&player) .ok_or(anyhow!("player does not exist"))?; - let dt = player.last_position_ts.elapsed().as_secs_f32(); - let dist = pos.distance(player.position); - let speed = dist / dt; - let interact_dist = player - .interacting - .map(|p| (p.as_vec2() + Vec2::splat(0.5)).distance(player.position)) - .unwrap_or_default(); - let movement_ok = speed < PLAYER_SPEED_LIMIT && dist < 1. && interact_dist < 2.; - if movement_ok { - player.position = pos; - player.last_position_ts = Instant::now(); - } + // let dt = player.last_position_ts.elapsed().as_secs_f32(); + // let dist = pos.distance(player.position); + // let speed = dist / dt; + // let interact_dist = player + // .interacting + // .map(|p| (p.as_vec2() + Vec2::splat(0.5)).distance(player.position)) + // .unwrap_or_default(); + // let movement_ok = speed < PLAYER_SPEED_LIMIT && dist < 1. && interact_dist < 2.; + // if movement_ok { + player.position = pos; + player.last_position_ts = Instant::now(); + // } self.packet_out.push_back(PacketC::Position { player: pid, pos: player.position, rot, }); - if !movement_ok { - bail!( - "{:?} moved to quickly. speed={speed:.02} dist={dist:.02}", - player.name - ) - } + // if !movement_ok { + // bail!( + // "{:?} moved to quickly. speed={speed:.02} dist={dist:.02}", + // player.name + // ) + // } } PacketS::Collide { player, force } => { self.packet_out |