Compare commits
2 Commits
d1f2607779
...
1d63c17bca
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d63c17bca | |||
| 3bf81c4cb9 |
@ -849,7 +849,6 @@ impl Game {
|
||||
self.run_deferred(move |s| {
|
||||
s.handle_swap_weapon(player_id, WeaponType::Ball, true, false)
|
||||
});
|
||||
self.ball_holder = Some(player_id);
|
||||
}
|
||||
}
|
||||
|
||||
@ -866,7 +865,10 @@ impl Game {
|
||||
}
|
||||
|
||||
if weapon_type == WeaponType::Ball {
|
||||
self.run_deferred(move |s| s.signals().on_pickup_ball().emit(player_id));
|
||||
self.ball_holder = Some(player_id);
|
||||
self.run_deferred(move |s| {
|
||||
s.signals().on_pickup_ball().emit(player_id);
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(player) = self.find_player(player_id).clone()
|
||||
@ -1081,7 +1083,7 @@ impl Game {
|
||||
let remote_location: Vector3 = transform.location.into();
|
||||
|
||||
let max_distance = (player.data.ping as f32 / 1000.)
|
||||
* (player.get_move_speed() + player.get_y_speed())
|
||||
* (player.get_move_speed() + player.get_y_speed().max(5.))
|
||||
* 2.;
|
||||
|
||||
if local_location.distance_to(remote_location) > max_distance {
|
||||
@ -1617,7 +1619,8 @@ impl Player {
|
||||
let client_pos: Vector3 = data.transform.location.into();
|
||||
|
||||
let max_distance = (self.data.ping as f32 / 1000.)
|
||||
* (character.dyn_bind().get_move_speed() + character.dyn_bind().get_y_speed());
|
||||
* (character.dyn_bind().get_move_speed()
|
||||
+ character.dyn_bind().get_y_speed().max(5.));
|
||||
|
||||
if client_pos.distance_to(server_pos) <= max_distance {
|
||||
character.dyn_bind_mut().apply_position(client_pos);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user