Hotfix

See README.md changelog to know whats changed.

Author: Pustalorc

README.md

@@ -1,6 +1,6 @@
 ----------- Unturned Server Manager -----------
 
-Version: Public 4.0.0.0
+Version: Public 4.0.0.1
 
 [![Github Releases](https://img.shields.io/github/downloads/persiafighter/UnturnedServerManager/latest/total.svg?style=plastic)](https://github.com/persiafighter/UnturnedServerManager/releases/latest)
 
@@ -14,14 +14,20 @@ Windows
 
 # Known Bugs:
 
-None as of 4.0.0.0
+None as of 4.0.0.1
 
 # Download:
 
 https://github.com/persiafighter/UnturnedServerManager/releases/latest
 
 # Changelog:
 
+**V4.0.0.1** -
+* Fixed raised exception when leaving the map field empty in the server configuration, saving and loading it again. (Credit to Luke_ArOres#0769 for finding it)
+* Fixed forgotten addition of auto-detection of workshop maps. (Credit to Luke_ArOres#0769 for reminding of this issue)
+* Fixed minor issue when loading maps for a vanilla server.
+* Updated Fody and Costura.Fody to latest versions.
+
 **V4.0.0.0** -
 
 * Added more local control over server instances.

src/GUI/Server Settings.cs

@@ -37,6 +37,24 @@ private void LoadMaps()
                 foreach (var rocketserver in RocketmodDirectoryInfo.GetDirectories())
                     Maps.Items.Add(rocketserver.Name);
             }
+            else
+            {
+                var Dir = Path.Combine(RocketmodServerPath.Value, "Maps");
+                FileActions.VerifyPath(Dir, true);
+
+                var VanillaDirectoryInfo = new DirectoryInfo(Dir);
+                foreach (var rocketserver in VanillaDirectoryInfo.GetDirectories())
+                    Maps.Items.Add(rocketserver.Name);
+            }
+
+            var WorkshopMaps = Path.Combine(server.Folder, "Workshop", "Maps");
+            FileActions.VerifyPath(WorkshopMaps, true);
+
+            var Fldr = new DirectoryInfo(WorkshopMaps);
+            var Content = Fldr.GetDirectories();
+            foreach (var folder in Content)
+                foreach (var MapName in folder.GetDirectories())
+                    Maps.Items.Add(MapName.Name);
         }
         private void Save()
         {
@@ -82,7 +100,12 @@ private void LoadSaved()
 
             NameSel.Text = conf.PublicName;
             Port.Value = conf.Port;
-            Maps.SelectedIndex = Maps.Items.IndexOf(conf.Map);
+
+            if (string.IsNullOrEmpty(conf.Map))
+                Maps.SelectedIndex = 0;
+            else
+                Maps.SelectedIndex = Maps.Items.IndexOf(conf.Map);
+
             PasswordSel.Text = conf.Password;
             OwnerID.Value = conf.Owner;
             MessageSel.Text = conf.LoginMessage;

src/Manager.csproj

@@ -61,8 +61,8 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
+    <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -197,15 +197,15 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.3.1.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.1.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" />
+  <Import Project="..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/Properties/AssemblyInfo.cs

@@ -10,5 +10,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2d1dcd0a-9719-44f5-8f0e-2fd79d918fb5")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.0.1")]
+[assembly: AssemblyFileVersion("4.0.0.1")]

src/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="2.0.1" targetFramework="net461" />
-  <package id="Fody" version="3.0.3" targetFramework="net461" developmentDependency="true" />
+  <package id="Costura.Fody" version="3.1.0" targetFramework="net461" />
+  <package id="Fody" version="3.1.3" targetFramework="net461" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
 </packages>