diff options
| author | unknown <for.oliver.kirkham@gmail.com> | 2023-02-14 14:16:35 +0000 |
|---|---|---|
| committer | unknown <for.oliver.kirkham@gmail.com> | 2023-02-14 14:16:35 +0000 |
| commit | b66871c8c826058e5da2d5ab3ecf1cdca1cdf9fc (patch) | |
| tree | cedb12739f00611df7ea0186377de079f62624d9 /NorthstarDLL/core | |
| parent | 263af88bb67349b5193dea6dac33664fc70bfede (diff) | |
| parent | 95b41b6f8cc612953eafd7f8b6b40124e1590bc7 (diff) | |
| download | NorthstarLauncher-b66871c8c826058e5da2d5ab3ecf1cdca1cdf9fc.tar.gz NorthstarLauncher-b66871c8c826058e5da2d5ab3ecf1cdca1cdf9fc.zip | |
Merge remote-tracking branch 'origin/main' into functionat-pr
Diffstat (limited to 'NorthstarDLL/core')
| -rw-r--r-- | NorthstarDLL/core/filesystem/rpakfilesystem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/NorthstarDLL/core/filesystem/rpakfilesystem.cpp b/NorthstarDLL/core/filesystem/rpakfilesystem.cpp index b46218e0..c3463781 100644 --- a/NorthstarDLL/core/filesystem/rpakfilesystem.cpp +++ b/NorthstarDLL/core/filesystem/rpakfilesystem.cpp @@ -267,6 +267,9 @@ void*, __fastcall, (const char* pPath, void* pCallback)) if (path.extension() == ".stbsp") { + if (IsDedicatedServer()) + return nullptr; + NS::log::rpak->info("LoadStreamBsp: {}", filename.string()); // resolve modded stbsp path so we can load mod stbsps @@ -279,6 +282,9 @@ void*, __fastcall, (const char* pPath, void* pCallback)) } else if (path.extension() == ".starpak") { + if (IsDedicatedServer()) + return nullptr; + // code for this is mostly stolen from above // unfortunately I can't find a way to get the rpak that is causing this function call, so I have to |