diff --git a/Nitrox.Bootloader/Main.cs b/Nitrox.Bootloader/Main.cs
index 268ab3fc3d..c9b5b1ad3b 100644
--- a/Nitrox.Bootloader/Main.cs
+++ b/Nitrox.Bootloader/Main.cs
@@ -103,7 +103,7 @@ private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEve
}
// Load DLLs where Nitrox launcher is first, if not found, use Subnautica's DLLs.
- string dllPath = Path.Combine(nitroxLauncherDir.Value, dllFileName);
+ string dllPath = Path.Combine(nitroxLauncherDir.Value, "lib", dllFileName);
if (!File.Exists(dllPath))
{
dllPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), dllFileName);
diff --git a/NitroxLauncher/LauncherLogic.cs b/NitroxLauncher/LauncherLogic.cs
index 8416a64b8c..5e20328c70 100644
--- a/NitroxLauncher/LauncherLogic.cs
+++ b/NitroxLauncher/LauncherLogic.cs
@@ -213,7 +213,7 @@ internal async Task StartMultiplayerAsync()
string bootloaderName = "Nitrox.Bootloader.dll";
try
{
- File.Copy(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), bootloaderName), Path.Combine(subnauticaPath, "Subnautica_Data", "Managed", bootloaderName), true);
+ File.Copy(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "lib", bootloaderName), Path.Combine(subnauticaPath, "Subnautica_Data", "Managed", bootloaderName), true);
}
catch (IOException)
{
diff --git a/NitroxLauncher/NitroxLauncher.csproj b/NitroxLauncher/NitroxLauncher.csproj
index 1cea34cf01..2d2df4204b 100644
--- a/NitroxLauncher/NitroxLauncher.csproj
+++ b/NitroxLauncher/NitroxLauncher.csproj
@@ -285,10 +285,22 @@
TODO: Try fix this as a project reference to Nitrox.Subnautica.Assets that will copy the files on build automatically. -->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/NitroxServer-Subnautica/App.config b/NitroxServer-Subnautica/App.config
index 60588c348c..89918f24b7 100644
--- a/NitroxServer-Subnautica/App.config
+++ b/NitroxServer-Subnautica/App.config
@@ -23,6 +23,7 @@
+
diff --git a/NitroxServer-Subnautica/Program.cs b/NitroxServer-Subnautica/Program.cs
index c31a7b22fd..1bea43bdb7 100644
--- a/NitroxServer-Subnautica/Program.cs
+++ b/NitroxServer-Subnautica/Program.cs
@@ -89,7 +89,7 @@ private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEve
}
// Load DLLs where this program (exe) is located
- string dllPath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), dllFileName);
+ string dllPath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "lib", dllFileName);
if (!File.Exists(dllPath))
{
// Try find game managed libraries