From fba47451623c8f2799b7fb58907ddb2a7bcd567c Mon Sep 17 00:00:00 2001 From: Rendo Date: Sat, 15 Nov 2025 23:06:41 +0500 Subject: [PATCH] Faction check is now optional --- src/projectile.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/projectile.rs b/src/projectile.rs index 507e499..af09c78 100644 --- a/src/projectile.rs +++ b/src/projectile.rs @@ -75,15 +75,17 @@ pub fn observe_collision( collision: On, mut commands: Commands, projectile_query: Query<&Projectile>, - mut collision_query: Query<(&mut Damagable, &Factions)>, + mut damagable_query: Query<(&mut Damagable, Option<&Factions>)>, ) { let Ok(projectile) = projectile_query.get(collision.entity) else { return; }; - let Ok((mut collided, faction)) = collision_query.get_mut(collision.with) else { + let Ok((mut collided, faction)) = damagable_query.get_mut(collision.with) else { return; }; - if projectile.faction.can_damage(faction) == false { + if let Some(f) = faction + && projectile.faction.can_damage(f) == false + { return; }