From 06728c1865c706d9bbf24fd2ae987dd514a387ac Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Tue, 23 Apr 2024 21:54:32 -0400
Subject: [PATCH] Static aura now uses Object::DeleteAfter instead of
 Projectile

---
 server/src/events/entity_creation.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
index 26cda7d444..dfd4f157a4 100644
--- a/server/src/events/entity_creation.rs
+++ b/server/src/events/entity_creation.rs
@@ -8,8 +8,8 @@ use common::{
         aura::{Aura, AuraKind, AuraTarget},
         buff::{BuffCategory, BuffData, BuffKind, BuffSource},
         ship::figuredata::VOXEL_COLLIDER_MANIFEST,
-        Alignment, BehaviorCapability, ItemDrops, LightEmitter, Ori, Pos, Projectile,
-        TradingBehavior, Vel, WaypointArea,
+        Alignment, BehaviorCapability, ItemDrops, LightEmitter, Ori, Pos, TradingBehavior, Vel,
+        WaypointArea,
     },
     event::{
         CreateAuraEntityEvent, CreateItemDropEvent, CreateNpcEvent, CreateObjectEvent,
@@ -492,6 +492,7 @@ pub fn handle_create_object(
 }
 
 pub fn handle_create_aura_entity(server: &mut Server, ev: CreateAuraEntityEvent) {
+    let time = *server.state.ecs().read_resource::<Time>();
     let mut entity = server
         .state
         .ecs_mut()
@@ -504,16 +505,11 @@ pub fn handle_create_aura_entity(server: &mut Server, ev: CreateAuraEntityEvent)
 
     // If a duration is specified, create a projectile component for the entity
     if let Some(dur) = ev.duration {
-        let projectile = Projectile {
-            hit_solid: Vec::new(),
-            hit_entity: Vec::new(),
-            time_left: Duration::from_secs_f64(dur.0),
-            owner: Some(ev.creator_uid),
-            ignore_group: true,
-            is_sticky: false,
-            is_point: false,
+        let object = comp::Object::DeleteAfter {
+            spawned_at: time,
+            timeout: Duration::from_secs_f64(dur.0),
         };
-        entity = entity.with(projectile);
+        entity = entity.with(object);
     }
     entity.build();
 }