UObjectHook: Fix materials getting applied to default actors

praydog · Oct 29, 2023 · b5236b8 · b5236b8
1 parent 10f6dea
commit b5236b8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/shared/sdk/FArrayProperty.cpp b/shared/sdk/FArrayProperty.cpp
@@ -62,6 +62,11 @@ void FArrayProperty::update_offsets() {
         continue;
     }
 
+    if (s_inner_offset == 0) {
+        SPDLOG_ERROR("[FArrayProperty::update_offsets] Failed to find property inner offset");
+        return;
+    }
+
     SPDLOG_INFO("[FArrayProperty::update_offsets] Done");
 }
 }
diff --git a/shared/sdk/FObjectProperty.cpp b/shared/sdk/FObjectProperty.cpp
@@ -48,6 +48,11 @@ void FObjectProperty::update_offsets() {
         continue;
     }
 
+    if (s_property_class_offset == 0) {
+        SPDLOG_ERROR("[FObjectProperty::update_offsets] Failed to find property class offset");
+        return;
+    }
+
     SPDLOG_INFO("[FObjectProperty::update_offsets] Done");
 }
 }
diff --git a/src/mods/UObjectHook.cpp b/src/mods/UObjectHook.cpp
@@ -1164,12 +1164,18 @@ void UObjectHook::ui_handle_material_interface(sdk::UObject* object) {
         //auto components = actor->get_all_components();
 
         for (auto comp_obj : components) {
-            auto comp = (sdk::UObject*)comp_obj;
+            auto comp = (sdk::UActorComponent*)comp_obj;
             if (comp->is_a(mesh_component_t)) {
                 if (comp == comp->get_class()->get_class_default_object()) {
                     continue;
                 }
 
+                auto owner = comp->get_owner();
+
+                if (owner == nullptr || owner->get_class()->get_class_default_object() == owner) {
+                    continue;
+                }
+
                 struct {
                     int32_t num{};
                 } get_num_materials_params{};