Merge pull request #301 from AnthonyTornetta/300-shields-stopped-working

300 shields stopped working
AnthonyTornetta · Aug 2, 2024 · 1824eaf · 1824eaf
2 parents a6fbd9c + fe178db
commit 1824eaf
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/cosmos_core/src/structure/shields/mod.rs b/cosmos_core/src/structure/shields/mod.rs
@@ -8,9 +8,14 @@ use bevy::{
         query::Changed,
         system::{Commands, Query},
     },
+    prelude::Parent,
     reflect::Reflect,
 };
-use bevy_rapier3d::geometry::{Collider, ColliderMassProperties, CollisionGroups, Group, Sensor};
+use bevy_rapier3d::{
+    geometry::{Collider, ColliderMassProperties, Group, Sensor},
+    plugin::RapierContextEntityLink,
+    prelude::CollisionGroups,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::netty::sync::{sync_component, IdentifiableComponent, SyncableComponent};
@@ -63,8 +68,12 @@ impl SyncableComponent for Shield {
 /// Things that should collide with shields should be put into this group
 pub const SHIELD_COLLISION_GROUP: Group = Group::GROUP_3;
 
-fn on_add_shield(q_added_shield: Query<(Entity, &Shield), Changed<Shield>>, mut commands: Commands) {
-    for (ent, shield) in q_added_shield.iter() {
+fn on_add_shield(
+    q_rapier_entity_link: Query<&RapierContextEntityLink>,
+    q_added_shield: Query<(Entity, &Shield, &Parent), Changed<Shield>>,
+    mut commands: Commands,
+) {
+    for (ent, shield, parent) in q_added_shield.iter() {
         assert!(shield.radius > 0.0, "Shield radius cannot be <= 0.0!");
 
         let mut ecmds = commands.entity(ent);
@@ -74,6 +83,9 @@ fn on_add_shield(q_added_shield: Query<(Entity, &Shield), Changed<Shield>>, mut
                 DespawnWithStructure,
                 Collider::ball(shield.radius),
                 CollisionGroups::new(SHIELD_COLLISION_GROUP, SHIELD_COLLISION_GROUP),
+                *q_rapier_entity_link
+                    .get(parent.get())
+                    .expect("Missing rapier entity link on shield's parent"),
                 ColliderMassProperties::Mass(0.0),
                 Sensor,
             ));
@@ -82,6 +94,9 @@ fn on_add_shield(q_added_shield: Query<(Entity, &Shield), Changed<Shield>>, mut
                 .insert((
                     DespawnWithStructure,
                     CollisionGroups::new(SHIELD_COLLISION_GROUP, SHIELD_COLLISION_GROUP),
+                    *q_rapier_entity_link
+                        .get(parent.get())
+                        .expect("Missing rapier entity link on shield's parent"),
                     ColliderMassProperties::Mass(0.0),
                     Sensor,
                 ))