PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fix moar

Browse Source
This commit is contained in:
John Gross
2019-06-06 18:03:58 -07:00
parent 3e5b29c84d
commit 97f380fb7b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Torch.Server/Initializer.cs
View File

@@ -171,9 +171,10 @@ quit";
File.Delete(STEAMCMD_ZIP); File.Delete(STEAMCMD_ZIP);
log.Info("SteamCMD downloaded successfully!"); log.Info("SteamCMD downloaded successfully!");
} }
catch catch (Exception e)
{ {
log.Error("Failed to download SteamCMD, unable to update the DS."); log.Error("Failed to download SteamCMD, unable to update the DS.");
log.Error(e);
return; return;
} }
} }

12
Torch.Server/Program.cs
View File

@@ -31,11 +31,17 @@ namespace Torch.Server
Directory.SetCurrentDirectory(workingDir); Directory.SetCurrentDirectory(workingDir);
//HACK for block skins update //HACK for block skins update
foreach (var f in Directory.EnumerateFiles(workingDir, "System.*", SearchOption.TopDirectoryOnly)) var badDlls = new[]
{ {
File.Delete(f); "System.Security.Principal.Windows.dll"
} };
foreach (var file in badDlls)
{
if (File.Exists(file))
File.Delete(file);
}
if (!TorchLauncher.IsTorchWrapped()) if (!TorchLauncher.IsTorchWrapped())
{ {
TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, binDir); TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, binDir);

2
Torch.Server/Torch.Server.csproj
View File

@@ -516,6 +516,6 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\TransformOnBuild.targets" /> <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" &amp; del "$(TargetDir)System.*"</PostBuildEvent> <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>