diff --git a/src/abilities/gun.rs b/src/abilities/gun.rs index e7e1ee8..97aa953 100644 --- a/src/abilities/gun.rs +++ b/src/abilities/gun.rs @@ -162,7 +162,7 @@ fn shot_collision( let shot_entity = if query_shot.contains(*e1) { *e1 } else { *e2 }; if let Ok(mut entity) = commands.get_entity(shot_entity) { - entity.despawn(); + entity.try_despawn(); } else { continue; } diff --git a/src/abilities/thrown.rs b/src/abilities/thrown.rs index 9d40695..f208ea9 100644 --- a/src/abilities/thrown.rs +++ b/src/abilities/thrown.rs @@ -173,7 +173,7 @@ fn shot_collision( }; if let Ok(mut entity) = commands.get_entity(shot_entity) { - entity.despawn(); + entity.try_despawn(); } else { continue; } diff --git a/src/tb_entities.rs b/src/tb_entities.rs index b87ddf3..ce7efe1 100644 --- a/src/tb_entities.rs +++ b/src/tb_entities.rs @@ -132,7 +132,7 @@ impl EnemySpawn { .unwrap(); let mut this_transform = *this_transform; - this_transform.translation += Vec3::new(0., 1., 0.); + this_transform.translation += Vec3::new(0., 1.5, 0.); let head = this.head.clone(); @@ -141,7 +141,7 @@ impl EnemySpawn { Name::from(format!("enemy [{}]", head)), Visibility::default(), RigidBody::Dynamic, - Collider::capsule(0.4, 2.), + Collider::capsule(0.6, 2.), CollisionLayers::new(LayerMask(GameLayer::Npc.to_bits()), LayerMask::ALL), LockedAxes::new().lock_rotation_z().lock_rotation_x(), ));