refactor(UEHelpers): In GetWorld() get UWorld from PlayerController, …

…fallback to GameInstance if a PlayerController doesn't exist
UE4SS-RE · Nov 26, 2024 · b47690f · b47690f
1 parent 65a9727
commit b47690f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/assets/Mods/shared/UEHelpers/UEHelpers.lua b/assets/Mods/shared/UEHelpers/UEHelpers.lua
@@ -102,13 +102,13 @@ local WorldCache = CreateInvalidObject() ---@cast WorldCache UWorld
 function UEHelpers.GetWorld()
     if WorldCache:IsValid() then return WorldCache end
 
-    local GameInstance = UEHelpers.GetGameInstance()
-    if GameInstance:IsValid() then
-        WorldCache = GameInstance:GetWorld()
-    else -- Worst case fallback, usaully should never happen
-        local PlayerController = UEHelpers.GetPlayerController()
-        if PlayerController:IsValid() then
-            WorldCache = PlayerController:GetWorld()
+    local PlayerController = UEHelpers.GetPlayerController()
+    if PlayerController:IsValid() then
+        WorldCache = PlayerController:GetWorld()
+    else
+        local GameInstance = UEHelpers.GetGameInstance()
+        if GameInstance:IsValid() then
+            WorldCache = GameInstance:GetWorld()
         end
     end
     return WorldCache