make sure game doesn't crash due to spawn not working

maximegmd · Feb 15, 2022 · 92fcc63 · 92fcc63
1 parent be28b93
commit 92fcc63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/reverse/RTTIExtender.cpp b/src/reverse/RTTIExtender.cpp
@@ -169,6 +169,7 @@ struct TEMP_PendingEntity
         virtual void AddRef() = 0;
     };
     RED4EXT_ASSERT_OFFSET(Unk00, entityID, 0x110);
+    RED4EXT_ASSERT_OFFSET(Unk00, entity, 0x118);
 
     Unk00* unk00;
     uint64_t unk08;
@@ -530,7 +531,9 @@ struct exEntitySpawnerSystem : gameIGameSystem
         };
 
         auto* pGameInstance = Singleton->gameInstance;
-        func(reinterpret_cast<GameInstance_78*>(pGameInstance->unk78)->unk00->worldRuntimeEntityRegistry, aUnk.entity);
+
+        if (aUnk.entity)
+            func(reinterpret_cast<GameInstance_78*>(pGameInstance->unk78)->unk00->worldRuntimeEntityRegistry, aUnk.entity);
     }
 
 public:

diff --git a/vendor/luasocket b/vendor/luasocket