Plugins: Activate UObjectHook if any functions are called

praydog · Jun 28, 2024 · 3d59cc8 · 3d59cc8
1 parent 6eecdb9
commit 3d59cc8
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/mods/PluginLoader.cpp b/src/mods/PluginLoader.cpp
@@ -474,11 +474,17 @@ namespace uobjecthook {
     }
 
     bool exists(UEVR_UObjectHandle obj) {
-        return UObjectHook::get()->exists((sdk::UObject*)obj);
+        auto& instance = UObjectHook::get();
+        instance->activate();
+
+        return instance->exists((sdk::UObject*)obj);
     }
 
     int get_objects_by_class(UEVR_UClassHandle klass, UEVR_UObjectHandle* out_objects, unsigned int max_objects, bool allow_default) {
-        const auto objects = UObjectHook::get()->get_objects_by_class((sdk::UClass*)klass);
+        auto& instance = UObjectHook::get();
+        instance->activate();
+
+        const auto objects = instance->get_objects_by_class((sdk::UClass*)klass);
 
         if (objects.empty()) {
             return 0;
@@ -515,7 +521,10 @@ namespace uobjecthook {
     }
 
     UEVR_UObjectHandle get_first_object_by_class(UEVR_UClassHandle klass, bool allow_default) {
-        const auto objects = UObjectHook::get()->get_objects_by_class((sdk::UClass*)klass);
+        auto& instance = UObjectHook::get();
+        instance->activate();
+
+        const auto objects = instance->get_objects_by_class((sdk::UClass*)klass);
 
         if (objects.empty()) {
             return nullptr;