From bd02a31979ecedd7c2dc7df822bda1b1d163548f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 19 Dec 2025 16:30:34 +0100 Subject: send movement packets on collisions --- server/protocol/src/movement.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'server/protocol/src') diff --git a/server/protocol/src/movement.rs b/server/protocol/src/movement.rs index 6a07687f..14aefacb 100644 --- a/server/protocol/src/movement.rs +++ b/server/protocol/src/movement.rs @@ -99,18 +99,19 @@ impl MovementBase { } } - pub fn collide(&mut self, other: &mut Self, dt: f32) { + pub fn collide(&mut self, other: &mut Self, dt: f32) -> bool { let diff = self.position - other.position; let d = diff.length(); if d < 0.01 { - return; + return false; } if d > PLAYER_SIZE * 2. { - return; + return false; } let norm = diff.normalize(); let f = 100. / (1. + d); - self.velocity += norm * f * dt + self.velocity += norm * f * dt; + true } pub fn get_interact_target(&self) -> IVec2 { (self.position + Vec2::new(self.rotation.sin(), self.rotation.cos())).as_ivec2() -- cgit v1.3