bug: Fix rhea and static script unloading.

Author: shanecelis

crates/bevy_mod_scripting_core/src/asset.rs

@@ -384,11 +384,13 @@ pub(crate) fn eval_script<P: IntoScriptPluginParams>(
         // }) {
         if let Some(script_id) = script_queue.pop_front() {
             if let Some(asset) = script_assets.get(script_id) {
-                commands.queue(CreateOrUpdateScript::<P>::new(
-                    script_id,
-                    asset.content.clone(),
-                    Some(Handle::Weak(script_id)),
-                ));
+                if asset.language == P::LANGUAGE {
+                    commands.queue(CreateOrUpdateScript::<P>::new(
+                        script_id,
+                        asset.content.clone(),
+                        Some(Handle::Weak(script_id)),
+                    ));
+                }
             } else {
                 // This is probably a load failure. What to do? We've already
                 // provided a warning on failure. Doing nothing is fine then we

crates/bevy_mod_scripting_core/src/commands.rs

@@ -84,6 +84,10 @@ impl<P: IntoScriptPluginParams> CreateOrUpdateScript<P> {
         }
     }
 
+    fn script_name(&self) -> String {
+        self.asset.as_ref().and_then(|handle| handle.path().map(|p| p.to_string())).unwrap_or_else(|| self.id.to_string())
+    }
+
     fn reload_context(
         &self,
         guard: WorldGuard,
@@ -215,7 +219,7 @@ impl<P: IntoScriptPluginParams> Command for CreateOrUpdateScript<P> {
                     handle_script_errors(
                         guard,
                         vec![err
-                            .with_script(self.id.clone())
+                            .with_script(self.script_name())
                             .with_context(P::LANGUAGE)
                             .with_context(phrase)]
                         .into_iter(),

examples/game_of_life.rs

@@ -57,7 +57,8 @@ fn run_script_cmd(
     asset_server: Res<AssetServer>,
     mut script_handle: Local<Option<Handle<ScriptAsset>>>,
     script_comps: Query<Entity, With<ScriptComponent>>,
-    mut static_scripts_created: Local<Vec<ScriptId>>,
+    mut static_lua_scripts: Local<Vec<ScriptId>>,
+    mut static_rhai_scripts: Local<Vec<ScriptId>>,
 ) {
     if let Some(Ok(command)) = log.take() {
         match command {
@@ -75,7 +76,11 @@ fn run_script_cmd(
                 } else {
                     bevy::log::info!("Using static script instead of spawning an entity");
                     let handle = asset_server.load(script_path);
-                    static_scripts_created.push(handle.id());
+                    if language == "lua" {
+                        static_lua_scripts.push(handle.id());
+                    } else {
+                        static_rhai_scripts.push(handle.id());
+                    }
                     commands.queue(AddStaticScript::new(handle))
                 }
             }
@@ -88,13 +93,17 @@ fn run_script_cmd(
                     commands.entity(id).despawn();
                 }
 
-                // you could also do
-                for script_id in static_scripts_created.drain(..) {
+                for script_id in static_lua_scripts.drain(..) {
                     commands.queue(DeleteScript::<LuaScriptingPlugin>::new(
                         script_id
                     ));
                 }
-                // as this will retain your script asset and handle
+
+                for script_id in static_rhai_scripts.drain(..) {
+                    commands.queue(DeleteScript::<RhaiScriptingPlugin>::new(
+                        script_id
+                    ));
+                }
             }
         }
     }