fix: return nil if component doesn't exist in lua script. (#267)

fishfolk · Nov 24, 2023 · 8ac0772 · 8ac0772
1 parent d939072
commit 8ac0772
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/framework_crates/bones_scripting/src/lua/bindings/components.rs b/framework_crates/bones_scripting/src/lua/bindings/components.rs
@@ -37,9 +37,16 @@ pub fn metatable(ctx: Context) -> Table {
             let ecsref = EcsRef {
                 data: EcsRefData::Component(ComponentRef { store, entity }),
                 path: default(),
+            };
+
+            // Return nil if the component is not present
+            if ecsref.borrow().schema_ref().is_err() {
+                stack.replace(ctx, Value::Nil);
+                return Ok(CallbackReturn::Return);
             }
-            .into_value(ctx);
-            stack.push_front(ecsref);
+
+            let ecsref = ecsref.into_value(ctx);
+            stack.replace(ctx, ecsref);
 
             Ok(CallbackReturn::Return)
         }),