lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-10 21:40:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

IsA, ClassName & Parent should work if an instance is already destroyed

Browse source
This commit is contained in:
Sasial 2024-11-02 15:58:29 +10:00
parent c935149c1e
commit 2d91123796
No known key found for this signature in database
GPG key ID: EDFF63A7501D3F83
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/lune-roblox/src/instance/base.rs
View file

@ -113,7 +113,6 @@ pub fn add_methods<'lua, M: LuaUserDataMethods<'lua, Instance>>(m: &mut M) {
}, },
); );
m.add_method("IsA", |_, this, class_name: String| { m.add_method("IsA", |_, this, class_name: String| {
ensure_not_destroyed(this)?;
Ok(class_is_a(&this.class_name, class_name).unwrap_or(false)) Ok(class_is_a(&this.class_name, class_name).unwrap_or(false))
}); });
m.add_method( m.add_method(
@ -217,19 +216,20 @@ fn instance_property_get<'lua>(
this: &Instance, this: &Instance,
prop_name: String, prop_name: String,
) -> LuaResult<LuaValue<'lua>> { ) -> LuaResult<LuaValue<'lua>> {
ensure_not_destroyed(this)?;
match prop_name.as_str() { match prop_name.as_str() {
"ClassName" => return this.get_class_name().into_lua(lua), "ClassName" => return this.get_class_name().into_lua(lua),
"Name" => {
return this.get_name().into_lua(lua);
}
"Parent" => { "Parent" => {
return this.get_parent().into_lua(lua); return this.get_parent().into_lua(lua);
} }
_ => {} _ => {}
} }
ensure_not_destroyed(this)?;
if prop_name.as_str() == "Name" {
return this.get_name().into_lua(lua);
}
if let Some(info) = find_property_info(&this.class_name, &prop_name) { if let Some(info) = find_property_info(&this.class_name, &prop_name) {
if let Some(prop) = this.get_property(&prop_name) { if let Some(prop) = this.get_property(&prop_name) {
if let DomValue::Enum(enum_value) = prop { if let DomValue::Enum(enum_value) = prop {

5
crates/lune-roblox/src/instance/mod.rs
View file

@ -302,10 +302,7 @@ impl Instance {
pub fn get_parent(&self) -> Option<Instance> { pub fn get_parent(&self) -> Option<Instance> {
let dom = INTERNAL_DOM.lock().expect("Failed to lock document"); let dom = INTERNAL_DOM.lock().expect("Failed to lock document");
let parent_ref = dom let parent_ref = dom.get_by_ref(self.dom_ref)?.parent();
.get_by_ref(self.dom_ref)
.expect("Failed to find instance in document")
.parent();
if parent_ref == dom.root_ref() { if parent_ref == dom.root_ref() {
None None