From a65c2359754dd66967eefa31353aca64f4662bc3 Mon Sep 17 00:00:00 2001
From: Bletch <bletch1971@hotmail.com>
Date: Fri, 18 Aug 2017 15:49:55 +1000
Subject: [PATCH 1/5] Misc Changes

1. Russian translation file updated
2. Removed the Wildcard version of the mod update.
---
 ARK Server Manager/ARK Server Manager.csproj  |  2 +-
 .../Globalization/ru-RU/ru-RU.xaml            | 18 ++++++++-
 ARK Server Manager/Lib/ServerProfile.cs       | 22 +----------
 .../Windows/ServerSettingsControl.xaml        | 37 -------------------
 .../Windows/ServerSettingsControl.xaml.cs     |  2 +-
 5 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/ARK Server Manager/ARK Server Manager.csproj b/ARK Server Manager/ARK Server Manager.csproj
index af56d09c..afec6107 100644
--- a/ARK Server Manager/ARK Server Manager.csproj	
+++ b/ARK Server Manager/ARK Server Manager.csproj	
@@ -31,7 +31,7 @@
     <ProductName>Ark Server Manager</ProductName>
     <PublisherName>Ark Server Manager</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.0.304.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ARK Server Manager/Globalization/ru-RU/ru-RU.xaml b/ARK Server Manager/Globalization/ru-RU/ru-RU.xaml
index dbd61121..58de967b 100644
--- a/ARK Server Manager/Globalization/ru-RU/ru-RU.xaml	
+++ b/ARK Server Manager/Globalization/ru-RU/ru-RU.xaml	
@@ -308,8 +308,6 @@
     <sys:String x:Key="GlobalSettings_ShutdownMessage3Tooltip">Это сообщение будет отображаться при завершении работы сервера.</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownWorldSaveLabel">Сообщение Сохранения мира:</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownWorldSaveTooltip">Это сообщение будет отображаться при завершении работы, когда мир будет сохранен.</sys:String>
-    <sys:String x:Key="GlobalSettings_WorldSaveDelayLabel">Задержка Сохранения мира:</sys:String>
-    <sys:String x:Key="GlobalSettings_WorldSaveDelayTooltip">Количество секунд ожидания команды Сохранения мира до завершения работы сервера.</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownCancelLabel">Сообщение при отмене:</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownCancelTooltip">Это сообщение будет отображаться, когда выключение сервера было отменено.</sys:String>
     <sys:String x:Key="GlobalSettings_EmailSettingsLabel">SMTP Настройки Email</sys:String>
@@ -339,6 +337,12 @@
     <sys:String x:Key="GlobalSettings_EmailNotify_AutoRestartTooltip">Если включено, по Email будет отправлено письмо о том что сервер выполняет Авто-Выключение.</sys:String>
     <sys:String x:Key="GlobalSettings_EmailNotify_ShutdownRestartLabel">Выключение/Перезагрузка</sys:String>
     <sys:String x:Key="GlobalSettings_EmailNotify_ShutdownRestartTooltip">Если включено, по Email будет отправлено письмо о том что сервер выполняет Выключение/Перезагрузку.</sys:String>
+    <sys:String x:Key="GlobalSettings_AdvancedSettingsLabel">Расширенные настройки</sys:String>
+    <sys:String x:Key="GlobalSettings_AdvancedSettingsInformationLabel">Не прикасайтесь к этим настройкам, если вы не знаете, что делаете</sys:String>
+    <sys:String x:Key="GlobalSettings_UseDoExitLabel">Использовать DoExit для завершения работы сервера</sys:String>
+    <sys:String x:Key="GlobalSettings_UseDoExitTooltip">Если включено, команда DoExit будет использоваться сначала для выключения сервера. Если он терпит неудачу или отключен, вместо этого используется метод Сtrl+С.</sys:String>
+    <sys:String x:Key="GlobalSettings_WorldSaveDelayLabel">Задержка Сохранения мира:</sys:String>
+    <sys:String x:Key="GlobalSettings_WorldSaveDelayTooltip">Количество секунд ожидания команды Сохранения мира до завершения работы сервера.</sys:String>
 
     <sys:String x:Key="GlobalSettings_DataDirectoryChange_ConfirmTitle">Подтвердить изменение каталога данных</sys:String>
     <sys:String x:Key="GlobalSettings_DataDirectoryChange_ConfirmLabel">Изменение каталога данных приведет к перемещению любых существующих профилей в новое место, но оно не будет перемещать установки сервера. Вы все еще хотите изменить этот каталог?</sys:String>
@@ -611,6 +615,10 @@
     <sys:String x:Key="ServerSettings_RCONLogBufferTooltip">Устанавливает максимальную длину RCON игрового лог буфера (по умолчанию 600).</sys:String>
     <sys:String x:Key="ServerSettings_ForceRespawnDinosLabel">Перезаселить Мир во время Запуска сервера (Вызывает лаг после запуска Сервера)</sys:String>
     <sys:String x:Key="ServerSettings_ForceRespawnDinosTooltip">Если включено, при запуске сервера все дикие существа будут уничтожены и обновлены (это уничтожит только диких существ, которые в настоящее время не приручены).</sys:String>
+    <sys:String x:Key="ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalLabel">Включить Авто Респаун Динозавров</sys:String>
+    <sys:String x:Key="ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalTooltip">Если включено, принудительное возрождение диких Динозавтров через указанный интервал.</sys:String>
+    <sys:String x:Key="ServerSettings_ServerAutoForceRespawnWildDinosIntervalLabel">Интервал Респауна Диких Дино</sys:String>
+    <sys:String x:Key="ServerSettings_ServerAutoForceRespawnWildDinosIntervalTooltip">Интервал между принудительным автоматическим респауном динозавров.</sys:String>
     <sys:String x:Key="ServerSettings_AltSaveDirectoryNameLabel">Альтернативная папка Сохранения:</sys:String>
     <sys:String x:Key="ServerSettings_AltSaveDirectoryNameLabel2">(Необязательно)</sys:String>
     <sys:String x:Key="ServerSettings_AltSaveDirectoryNameTooltip">Устанавливает имя каталога (под серверами «Сохраненная папка») для хранения файлов мира, игрока и племени.</sys:String>
@@ -852,6 +860,10 @@
     <sys:String x:Key="ServerSettings_AllowCancelTribeWarfareTooltip">Если этот параметр включен, племена могут отменить согласованную войну, прежде чем она началась.</sys:String>
     <sys:String x:Key="ServerSettings_AllowTribeAlliancesLabel">Разрешить Альянсы Племён</sys:String>
     <sys:String x:Key="ServerSettings_AllowTribeAlliancesTooltip">Если включено, игроки могут создавать Альянсы с другими Племенами.</sys:String>
+    <sys:String x:Key="ServerSettings_MaxAlliancesPerTribeLabel">Максимальное количество Альянсов в Трайбе</sys:String>
+    <sys:String x:Key="ServerSettings_MaxAlliancesPerTribeTooltip">Максимальное количество альянсов разрешено для каждого трайба.</sys:String>
+    <sys:String x:Key="ServerSettings_MaxTribesPerAllianceLabel">Максимальное число Трайбов в Альянсе</sys:String>
+    <sys:String x:Key="ServerSettings_MaxTribesPerAllianceTooltip">Максимальное количество трайба, разрешенных в каждом альянсе.</sys:String>
 
     <sys:String x:Key="ServerSettings_AllowCustomRecipesLabel">Разрешить пользовательские рецепты</sys:String>
     <sys:String x:Key="ServerSettings_AllowCustomRecipesTooltip">Если этот параметр включен, игроки могут использовать пользовательские RP-ориентированный Рецепт/Систему Кулинарии (в том числе на основе результатов навыка).</sys:String>
@@ -994,6 +1006,8 @@
     <sys:String x:Key="ServerSettings_MaxTamedDinosTooltip">Установить максимальное количество домашних динозавров на сервере.</sys:String>
     <sys:String x:Key="ServerSettings_MaxPersonalTamedDinosLabel">Максимально ручных: (Племя):</sys:String>
     <sys:String x:Key="ServerSettings_MaxPersonalTamedDinosTooltip">Установить максимальное количество домашних динозавров в Племени.</sys:String>
+    <sys:String x:Key="ServerSettings_PersonalTamedDinosSaddleStructureCostLabel">Колличество Сёдел платформ в Трайбе</sys:String>
+    <sys:String x:Key="ServerSettings_PersonalTamedDinosSaddleStructureCostTooltip">Количество прирученных динозавров седлами платформами (со структурами) разрешено в Трайбе.</sys:String>
     <sys:String x:Key="ServerSettings_DinoSpawnsLabel">Появление Дино:</sys:String>
     <sys:String x:Key="ServerSettings_DinoSpawnsTooltip">Определяет коэффициент для появления динозавров. Более высокие значения увеличивают колличество появляемых динозавров по всему ARК.</sys:String>
     <sys:String x:Key="ServerSettings_AllowRaidDinoFeedingLabel">Разрешить на постоянной основе держать Рейд-Животных.</sys:String>
diff --git a/ARK Server Manager/Lib/ServerProfile.cs b/ARK Server Manager/Lib/ServerProfile.cs
index 8978bc11..d8ef3d10 100644
--- a/ARK Server Manager/Lib/ServerProfile.cs	
+++ b/ARK Server Manager/Lib/ServerProfile.cs	
@@ -740,14 +740,6 @@ public bool AutoRestartIfShutdown
             get { return (bool)GetValue(AutoRestartIfShutdownProperty); }
             set { SetValue(AutoRestartIfShutdownProperty, value); }
         }
-
-        public static readonly DependencyProperty AutoManagedModsProperty = DependencyProperty.Register(nameof(AutoManagedMods), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
-        [DataMember]
-        public bool AutoManagedMods
-        {
-            get { return (bool)GetValue(AutoManagedModsProperty); }
-            set { SetValue(AutoManagedModsProperty, value); }
-        }
         #endregion
 
         #region Rules
@@ -3016,11 +3008,6 @@ public string GetServerArgs()
                 serverArgs.Append(" -webalarm");
             }
 
-            if (this.AutoManagedMods)
-            {
-                serverArgs.Append(" -automanagedmods");
-            }
-
             if (this.UseBattlEye)
             {
                 serverArgs.Append(" -UseBattlEye");
@@ -3314,10 +3301,6 @@ public void Save(bool updateFolderPermissions, bool updateSchedules, ProgressDel
                 PGM_Enabled = false;
             }
 
-            // ensure that the ARK mod management is switched off for ASM controlled profiles
-            if (EnableAutoUpdate)
-                AutoManagedMods = false;
-
             if (!OverrideNamedEngramEntries.IsEnabled)
                 OnlyAllowSpecifiedEngrams = false;
             OverrideNamedEngramEntries.OnlyAllowSelectedEngrams = OnlyAllowSpecifiedEngrams;
@@ -3598,7 +3581,7 @@ public bool Validate(bool forceValidate, out string validationMessage)
 
             var appId = SOTF_Enabled ? Config.Default.AppId_SotF : Config.Default.AppId;
 
-            if (forceValidate || (Config.Default.ValidateProfileOnServerStart && !AutoManagedMods))
+            if (forceValidate || Config.Default.ValidateProfileOnServerStart)
             {
                 // build a list of mods to be processed
                 var serverMapModId = GetProfileMapModId(this);
@@ -4158,7 +4141,6 @@ public void ResetAdministrationSection()
             this.ClearValue(ServerMapProperty);
             this.ClearValue(TotalConversionModIdProperty);
             this.ClearValue(ServerModIdsProperty);
-            this.ClearValue(AutoManagedModsProperty);
 
             this.ClearValue(EnableExtinctionEventProperty);
             this.ClearValue(ExtinctionEventTimeIntervalProperty);
@@ -4630,8 +4612,6 @@ private void SyncAutomaticManagement(ServerProfile sourceProfile)
             this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2);
             this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2);
             this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown);
-
-            this.SetValue(AutoManagedModsProperty, sourceProfile.AutoManagedMods);
         }
 
         private void SyncChatAndNotificationsSection(ServerProfile sourceProfile)
diff --git a/ARK Server Manager/Windows/ServerSettingsControl.xaml b/ARK Server Manager/Windows/ServerSettingsControl.xaml
index 4d597a8b..5913519b 100644
--- a/ARK Server Manager/Windows/ServerSettingsControl.xaml	
+++ b/ARK Server Manager/Windows/ServerSettingsControl.xaml	
@@ -1534,43 +1534,6 @@
                                         <CheckBox Grid.Row="3" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding AutoRestartIfShutdown}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_RestartIfShutdownLabel}" ToolTip="{DynamicResource ServerSettings_RestartIfShutdownTooltip}" HorizontalAlignment="Left"/>
                                     </Grid>
                                 </GroupBox>
-
-                                <GroupBox Style="{StaticResource GroupBoxStyle}">
-                                    <GroupBox.Header>
-                                        <DockPanel>
-                                            <TextBlock DockPanel.Dock="Left"  HorizontalAlignment="Left" TextWrapping="Wrap" Text="{DynamicResource ServerSettings_ARKSettingLabel}" VerticalAlignment="Center"/>
-                                            <Button Margin="10,0,0,1" DockPanel.Dock="Right" Content="{DynamicResource ServerSettings_NoAutoManagementButtonLabel}" Click="ArkAutoSettings_Click">
-                                                <Button.Style>
-                                                    <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding EnableAutoUpdate}" Value="True">
-                                                                <Setter Property="Visibility" Value="Visible"/>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding EnableAutoUpdate}" Value="False">
-                                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </Button.Style>
-                                            </Button>
-                                        </DockPanel>
-                                    </GroupBox.Header>
-
-                                    <CheckBox Margin="5" IsChecked="{Binding AutoManagedMods}" Content="{DynamicResource ServerSettings_AutoManagedModsLabel}" ToolTip="{DynamicResource ServerSettings_AutoManagedModsTooltip}" HorizontalAlignment="Left">
-                                        <CheckBox.Style>
-                                            <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding EnableSOTFCheckbox}" Value="true">
-                                                        <Setter Property="IsEnabled" Value="False"/>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding EnableAutoUpdate}" Value="true">
-                                                        <Setter Property="IsEnabled" Value="False"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </CheckBox.Style>
-                                    </CheckBox>
-                                </GroupBox>
                             </StackPanel>
                         </Expander>
 
diff --git a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs
index da1516cf..655583b9 100644
--- a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
+++ b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
@@ -421,7 +421,7 @@ private async void Start_Click(object sender, RoutedEventArgs e)
                         {
                             this.Settings.Save(false, false, null);
 
-                            if (Config.Default.ServerUpdate_OnServerStart && !this.Server.Profile.AutoManagedMods)
+                            if (Config.Default.ServerUpdate_OnServerStart)
                             {
                                 if (!await UpdateServer(false, true, Config.Default.ServerUpdate_UpdateModsWhenUpdatingServer, true))
                                 {

From fe192bf7c90e5de05a8fa87967381474318f6a6d Mon Sep 17 00:00:00 2001
From: Bletch <bletch1971@hotmail.com>
Date: Tue, 22 Aug 2017 09:48:58 +1000
Subject: [PATCH 2/5] Misc Changes

1. Changed Code Signing Certificate
2. Added Select All/Unselect All engram confirmation.
---
 ARK Server Manager/ARK Server Manager.csproj        | 13 +++++--------
 ARK Server Manager/Globalization/en-US/en-US.xaml   |  4 ++++
 .../Windows/ServerSettingsControl.xaml.cs           |  6 ++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ARK Server Manager/ARK Server Manager.csproj b/ARK Server Manager/ARK Server Manager.csproj
index afec6107..a98443cb 100644
--- a/ARK Server Manager/ARK Server Manager.csproj	
+++ b/ARK Server Manager/ARK Server Manager.csproj	
@@ -31,7 +31,7 @@
     <ProductName>Ark Server Manager</ProductName>
     <PublisherName>Ark Server Manager</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>1.0.304.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -60,10 +60,11 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>EE7A30F55A772EFD37652078F90C65225FAA2B9C</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>7DFBA05C211ED284CE4F133A66DECE97CFDB754D</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ARK Server Manager_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -91,7 +92,7 @@
     <StartupObject>ARK_Server_Manager.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestTimestampUrl>http://timestamp.globalsign.com/scripts/timestamp.dll</ManifestTimestampUrl>
+    <ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
@@ -324,7 +325,6 @@
     <Compile Include="Windows\SettingsWindow.xaml.cs">
       <DependentUpon>SettingsWindow.xaml</DependentUpon>
     </Compile>
-    <None Include="ARK Server Manager_TemporaryKey.pfx" />
     <None Include="DeployBetaToAWS.cmd" />
     <Resource Include="Art\SteamCMD.png" />
     <Resource Include="Art\OpenLog.png" />
@@ -552,9 +552,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="BeforePublish">
-    <Exec Command="&quot;C:\Program Files (x86)\Windows Kits\8.1\bin\x86\signtool.exe&quot; sign /f &quot;$(ProjectDir)Ark Server Manager_TemporaryKey.pfx&quot; /p &quot;b@}l@;jDVT4S&quot; /v &quot;$(ProjectDir)obj\$(ConfigurationName)\$(TargetFileName)&quot;" />
-  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.5\Microsoft.Expression.Blend.WPF.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.
diff --git a/ARK Server Manager/Globalization/en-US/en-US.xaml b/ARK Server Manager/Globalization/en-US/en-US.xaml
index f51c10f0..ab897f1f 100644
--- a/ARK Server Manager/Globalization/en-US/en-US.xaml	
+++ b/ARK Server Manager/Globalization/en-US/en-US.xaml	
@@ -1266,6 +1266,10 @@
 
     <sys:String x:Key="ServerSettings_EngramsOverride_ResetTitle">Confirm Reset Action</sys:String>
     <sys:String x:Key="ServerSettings_EngramsOverride_ResetLabel">Click 'Yes' to confirm you want to reset all the current engram changes.</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsOverride_SelectAllConfirmTitle">Confirm Select All Action</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsOverride_SelectAllConfirmLabel">Click 'Yes' to confirm you want to select all the engrams.</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsOverride_UnselectAllConfirmTitle">Confirm Unselect All Action</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsOverride_UnselectAllConfirmLabel">Click 'Yes' to confirm you want to unselect all the engrams.</sys:String>
 
     <!-- Server Settings - Custom Level Progressions -->
     <sys:String x:Key="ServerSettings_CustomLevelProgressionsLabel">Custom Level Progressions</sys:String>
diff --git a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs
index 655583b9..0a1536da 100644
--- a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
+++ b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
@@ -1251,6 +1251,9 @@ private void Engrams_Reset(object sender, RoutedEventArgs e)
 
         private void Engrams_SelectAll(object sender, RoutedEventArgs e)
         {
+            if (MessageBox.Show(_globalizer.GetResourceString("ServerSettings_EngramsOverride_SelectAllConfirmLabel"), _globalizer.GetResourceString("ServerSettings_EngramsOverride_SelectAllConfirmTitle"), MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                return;
+
             foreach (var engram in Settings.OverrideNamedEngramEntries)
             {
                 engram.SaveEngramOverride = true;
@@ -1259,6 +1262,9 @@ private void Engrams_SelectAll(object sender, RoutedEventArgs e)
 
         private void Engrams_UnselectAll(object sender, RoutedEventArgs e)
         {
+            if (MessageBox.Show(_globalizer.GetResourceString("ServerSettings_EngramsOverride_UnselectAllConfirmLabel"), _globalizer.GetResourceString("ServerSettings_EngramsOverride_UnselectAllConfirmTitle"), MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                return;
+
             foreach (var engram in Settings.OverrideNamedEngramEntries)
             {
                 engram.SaveEngramOverride = false;

From 297c06ad738801977f283de7e79a8791b323ab8d Mon Sep 17 00:00:00 2001
From: Bletch <bletch1971@hotmail.com>
Date: Tue, 22 Aug 2017 14:33:56 +1000
Subject: [PATCH 3/5] Misc Changes

1. fixed ArkData reading tribe and player files with duplicate file
names.
2. added new global alert messages for updates and server status
changes.
3. added additional exception handling around ArkData
Container.CreateAsync.
4. Added alert messages for server status changes.
---
 ARK Server Manager/ARK Server Manager.csproj  |  2 +-
 ARK Server Manager/App.config                 |  9 +++
 ARK Server Manager/Config.Designer.cs         | 36 +++++++++++
 ARK Server Manager/Config.settings            |  9 +++
 .../Globalization/en-US/en-US.xaml            |  6 ++
 ARK Server Manager/Lib/ServerApp.cs           | 14 +++--
 ARK Server Manager/Lib/ServerRCON.cs          | 60 +++++++++++--------
 ARK Server Manager/Lib/ServerRuntime.cs       | 43 ++++++-------
 .../Windows/GlobalSettingsControl.xaml        |  9 +++
 ArkData/ArkDataContainerAsync.cs              |  4 +-
 ArkData/ArkDataContainerSync.cs               |  4 +-
 Plugin.Common/Enums/AlertTypeEnum.cs          |  1 +
 12 files changed, 140 insertions(+), 57 deletions(-)

diff --git a/ARK Server Manager/ARK Server Manager.csproj b/ARK Server Manager/ARK Server Manager.csproj
index a98443cb..f6c9fde7 100644
--- a/ARK Server Manager/ARK Server Manager.csproj	
+++ b/ARK Server Manager/ARK Server Manager.csproj	
@@ -31,7 +31,7 @@
     <ProductName>Ark Server Manager</ProductName>
     <PublisherName>Ark Server Manager</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>5</ApplicationRevision>
     <ApplicationVersion>1.0.304.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ARK Server Manager/App.config b/ARK Server Manager/App.config
index 81e6a3bd..c076b870 100644
--- a/ARK Server Manager/App.config	
+++ b/ARK Server Manager/App.config	
@@ -614,6 +614,15 @@
       <setting name="ServerShutdown_UseDoExit" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="Alert_ServerStatusChange" serializeAs="String">
+        <value>Server Status:</value>
+      </setting>
+      <setting name="Alert_ServerUpdate" serializeAs="String">
+        <value>Game Server Update</value>
+      </setting>
+      <setting name="Alert_UpdateResults" serializeAs="String">
+        <value>Update performed, includes:</value>
+      </setting>
     </ARK_Server_Manager.Config>
   </userSettings>
 </configuration>
diff --git a/ARK Server Manager/Config.Designer.cs b/ARK Server Manager/Config.Designer.cs
index 20aeb643..60dc9443 100644
--- a/ARK Server Manager/Config.Designer.cs	
+++ b/ARK Server Manager/Config.Designer.cs	
@@ -1903,5 +1903,41 @@ public bool ServerShutdown_UseDoExit {
                 this["ServerShutdown_UseDoExit"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Server Status:")]
+        public string Alert_ServerStatusChange {
+            get {
+                return ((string)(this["Alert_ServerStatusChange"]));
+            }
+            set {
+                this["Alert_ServerStatusChange"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Game Server Update")]
+        public string Alert_ServerUpdate {
+            get {
+                return ((string)(this["Alert_ServerUpdate"]));
+            }
+            set {
+                this["Alert_ServerUpdate"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Update performed, includes:")]
+        public string Alert_UpdateResults {
+            get {
+                return ((string)(this["Alert_UpdateResults"]));
+            }
+            set {
+                this["Alert_UpdateResults"] = value;
+            }
+        }
     }
 }
diff --git a/ARK Server Manager/Config.settings b/ARK Server Manager/Config.settings
index 3975a003..f81de8c8 100644
--- a/ARK Server Manager/Config.settings	
+++ b/ARK Server Manager/Config.settings	
@@ -536,5 +536,14 @@
     <Setting Name="ServerShutdown_UseDoExit" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="Alert_ServerStatusChange" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Server Status:</Value>
+    </Setting>
+    <Setting Name="Alert_ServerUpdate" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Game Server Update</Value>
+    </Setting>
+    <Setting Name="Alert_UpdateResults" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Update performed, includes:</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/ARK Server Manager/Globalization/en-US/en-US.xaml b/ARK Server Manager/Globalization/en-US/en-US.xaml
index ab897f1f..5bbb81b6 100644
--- a/ARK Server Manager/Globalization/en-US/en-US.xaml	
+++ b/ARK Server Manager/Globalization/en-US/en-US.xaml	
@@ -383,6 +383,12 @@
     <sys:String x:Key="GlobalSettings_Alerts_RestartProcessErrorTooltip">This message will be displayed when the auto-restart process encountered an error.</sys:String>
     <sys:String x:Key="GlobalSettings_Alerts_UpdateProcessErrorLabel">Update Process Error:</sys:String>
     <sys:String x:Key="GlobalSettings_Alerts_UpdateProcessErrorTooltip">This message will be displayed when the auto-update process encountered an error.</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_UpdateResultsLabel">Update Results:</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_UpdateResultsTooltip">This message will be displayed when the auto-update process finds something to update.</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ServerUpdateLabel">Server Update Message:</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ServerUpdateTooltip">This message will be displayed when the game server has been updated.</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeLabel">Server Status Change:</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeTooltip">This message will be displayed when the status of the server changes.</sys:String>
 
     <!-- 
     Main Window 
diff --git a/ARK Server Manager/Lib/ServerApp.cs b/ARK Server Manager/Lib/ServerApp.cs
index cd870126..d6c04175 100644
--- a/ARK Server Manager/Lib/ServerApp.cs	
+++ b/ARK Server Manager/Lib/ServerApp.cs	
@@ -1155,7 +1155,7 @@ private void UpdateFiles()
             LogProfileMessage("------------------------");
             LogProfileMessage("Started server update...");
             LogProfileMessage("------------------------");
-            LogProfileMessage($"ASM version: {App.Version}");
+            LogProfileMessage($"Server Manager version: {App.Version}");
 
             // check if the server needs to be updated
             var serverCacheLastUpdated = GetServerLatestTime(GetServerCacheTimeFile());
@@ -1230,9 +1230,9 @@ private void UpdateFiles()
                 if (ExitCode != EXITCODE_NORMALEXIT)
                     return;
 
-                emailMessage.AppendLine("ASM Update Summary:");
+                emailMessage.AppendLine("Update Summary:");
                 emailMessage.AppendLine();
-                emailMessage.AppendLine($"ASM version: {App.Version}");
+                emailMessage.AppendLine($"Server Manager version: {App.Version}");
 
                 // make a backup of the current profile and config files.
                 CreateProfileBackupArchiveFile();
@@ -1253,7 +1253,8 @@ private void UpdateFiles()
                 bool createdNew = false;
 
                 alertMessage.AppendLine();
-                alertMessage.AppendLine("Update performed, includes:");
+                if (!string.IsNullOrWhiteSpace(Config.Default.Alert_UpdateResults))
+                    alertMessage.AppendLine(Config.Default.Alert_UpdateResults);
 
                 // check if the server needs to be updated
                 if (updateServer)
@@ -1261,7 +1262,7 @@ private void UpdateFiles()
                     LogProfileMessage("Updating server from cache...");
 
                     emailMessage.AppendLine();
-                    emailMessage.AppendLine("ARK Server Update:");
+                    emailMessage.AppendLine("Game Server Update:");
 
                     try
                     {
@@ -1275,7 +1276,8 @@ private void UpdateFiles()
                             LogProfileMessage("Updated server from cache. See ARK patch notes.");
                             LogProfileMessage(Config.Default.ArkSE_PatchNotesUrl);
 
-                            alertMessage.AppendLine("ARK Server Update");
+                            if (!string.IsNullOrWhiteSpace(Config.Default.Alert_ServerUpdate))
+                                alertMessage.AppendLine(Config.Default.Alert_ServerUpdate);
 
                             emailMessage.AppendLine();
                             emailMessage.AppendLine("Updated server from cache. See ARK patch notes.");
diff --git a/ARK Server Manager/Lib/ServerRCON.cs b/ARK Server Manager/Lib/ServerRCON.cs
index 37e761c6..088ec9e8 100644
--- a/ARK Server Manager/Lib/ServerRCON.cs	
+++ b/ARK Server Manager/Lib/ServerRCON.cs	
@@ -1,13 +1,13 @@
 using ARK_Server_Manager.Lib.ViewModel.RCON;
+using ArkData;
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Diagnostics;
-using System.IO;
 
 namespace ARK_Server_Manager.Lib
 {
@@ -424,29 +424,39 @@ private async Task UpdatePlayerDetails()
                 return;
             updatingPlayerDetails = true;
 
-            if (!String.IsNullOrEmpty(rconParams.InstallDirectory))
+            try
             {
-                var savedPath = ServerProfile.GetProfileSavePath(rconParams.InstallDirectory, rconParams.AltSaveDirectoryName, rconParams.PGM_Enabled, rconParams.PGM_Name);
-                var dataContainer = await ArkData.ArkDataContainer.CreateAsync(savedPath);
-
-                try
-                {
-                    await dataContainer.LoadSteamAsync(SteamUtils.SteamWebApiKey);
-                    debugLogger.Debug($"{nameof(UpdatePlayerDetails)} - LoadSteamAsync called.\r\n{savedPath}");
-                }
-                catch (Exception ex)
+                if (!String.IsNullOrEmpty(rconParams.InstallDirectory))
                 {
-                    errorLogger.Error($"{nameof(UpdatePlayerDetails)} - Error: LoadSteamAsync. {ex.Message}\r\n{ex.StackTrace}");
-                }
+                    var savedPath = ServerProfile.GetProfileSavePath(rconParams.InstallDirectory, rconParams.AltSaveDirectoryName, rconParams.PGM_Enabled, rconParams.PGM_Name);
+                    ArkDataContainer dataContainer = null;
 
-                TaskUtils.RunOnUIThreadAsync(() =>
-                {
-                    // create a new temporary list
-                    List<PlayerInfo> players = new List<PlayerInfo>(this.Players.Count + dataContainer.Players.Count);
-                    players.AddRange(this.Players);
+                    try
+                    {
+                        dataContainer = await ArkDataContainer.CreateAsync(savedPath);
+                    }
+                    catch (Exception ex)
+                    {
+                        errorLogger.Error($"{nameof(UpdatePlayerDetails)} - Error: CreateAsync. {ex.Message}\r\n{ex.StackTrace}");
+                        return;
+                    }
 
                     try
                     {
+                        await dataContainer.LoadSteamAsync(SteamUtils.SteamWebApiKey);
+                    }
+                    catch (Exception ex)
+                    {
+                        errorLogger.Error($"{nameof(UpdatePlayerDetails)} - Error: LoadSteamAsync. {ex.Message}\r\n{ex.StackTrace}");
+                        return;
+                    }
+
+                    TaskUtils.RunOnUIThreadAsync(() =>
+                    {
+                        // create a new temporary list
+                        List<PlayerInfo> players = new List<PlayerInfo>(this.Players.Count + dataContainer.Players.Count);
+                        players.AddRange(this.Players);
+
                         foreach (var playerData in dataContainer.Players)
                         {
                             PlayerInfo player = null;
@@ -494,12 +504,12 @@ private async Task UpdatePlayerDetails()
 
                         this.Players = new SortableObservableCollection<PlayerInfo>(players);
                         OnPlayerCollectionUpdated();
-                    }
-                    finally
-                    {
-                        updatingPlayerDetails = false;
-                    }
-                }).DoNotWait();
+                    }).DoNotWait();
+                }
+            }
+            finally
+            {
+                updatingPlayerDetails = false;
             }
         }
 
diff --git a/ARK Server Manager/Lib/ServerRuntime.cs b/ARK Server Manager/Lib/ServerRuntime.cs
index 0f38996d..1ab7b7d7 100644
--- a/ARK Server Manager/Lib/ServerRuntime.cs	
+++ b/ARK Server Manager/Lib/ServerRuntime.cs	
@@ -1,4 +1,5 @@
 using ARK_Server_Manager.Lib.Model;
+using ArkServerManager.Plugin.Common;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -283,42 +284,35 @@ private void ProcessStatusUpdate(IAsyncDisposable registration, ServerStatusWatc
 
             TaskUtils.RunOnUIThreadAsync(() =>
             {
+                var oldStatus = this.Status;
                 switch (update.Status)
                 {
                     case ServerStatusWatcher.ServerStatus.NotInstalled:
-                        this.Status = ServerStatus.Uninstalled;
-                        this.Steam = SteamStatus.Unavailable;
+                        UpdateServerStatus(ServerStatus.Uninstalled, SteamStatus.Unavailable, false);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.Initializing:
-                        this.Status = ServerStatus.Initializing;
-                        this.Steam = SteamStatus.Unavailable;
+                        UpdateServerStatus(ServerStatus.Initializing, SteamStatus.Unavailable, oldStatus != ServerStatus.Initializing && oldStatus != ServerStatus.Unknown);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.Stopped:
-                        this.Status = ServerStatus.Stopped;
-                        this.Steam = SteamStatus.Unavailable;
+                        UpdateServerStatus(ServerStatus.Stopped, SteamStatus.Unavailable, oldStatus == ServerStatus.Initializing || oldStatus == ServerStatus.Running || oldStatus == ServerStatus.Stopping);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.Unknown:
-                        this.Status = ServerStatus.Unknown;
-                        this.Steam = SteamStatus.Unknown;
+                        UpdateServerStatus(ServerStatus.Unknown, SteamStatus.Unknown, false);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.RunningLocalCheck:
-                        this.Status = ServerStatus.Running;
-                        if (this.Steam != SteamStatus.Available)
-                            this.Steam = SteamStatus.WaitingForPublication;
+                        UpdateServerStatus(ServerStatus.Running, this.Steam != SteamStatus.Available ? SteamStatus.WaitingForPublication : this.Steam, oldStatus != ServerStatus.Running && oldStatus != ServerStatus.Unknown);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.RunningExternalCheck:
-                        this.Status = ServerStatus.Running;
-                        this.Steam = SteamStatus.WaitingForPublication;
+                        UpdateServerStatus(ServerStatus.Running, SteamStatus.WaitingForPublication, oldStatus != ServerStatus.Running && oldStatus != ServerStatus.Unknown);
                         break;
 
                     case ServerStatusWatcher.ServerStatus.Published:
-                        this.Status = ServerStatus.Running;
-                        this.Steam = SteamStatus.Available;
+                        UpdateServerStatus(ServerStatus.Running, SteamStatus.Available, oldStatus != ServerStatus.Running && oldStatus != ServerStatus.Unknown);
                         break;
                 }
 
@@ -407,7 +401,7 @@ private void UnregisterForUpdates()
 
         public Task StartAsync()
         {
-            if(!System.Environment.Is64BitOperatingSystem)
+            if(!Environment.Is64BitOperatingSystem)
             {
                 MessageBox.Show("ARK: Survival Evolved(tm) Server requires a 64-bit operating system to run.  Your operating system is 32-bit and therefore the Ark Server Manager cannot start the server.  You may still load and save profiles and settings files for use on other machines.", "64-bit OS Required", MessageBoxButton.OK, MessageBoxImage.Error);
                 return TaskUtils.FinishedTask;
@@ -423,7 +417,7 @@ public Task StartAsync()
             }
 
             UnregisterForUpdates();
-            this.Status = ServerStatus.Initializing;
+            UpdateServerStatus(ServerStatus.Initializing, this.Steam, true);
 
             var serverExe = GetServerExe();
             var launcherExe = GetServerLauncherFile();
@@ -485,8 +479,7 @@ public async Task StopAsync()
 
                         if (this.serverProcess != null)
                         {
-                            this.Status = ServerStatus.Stopping;
-                            this.Steam = SteamStatus.Unavailable;
+                            UpdateServerStatus(ServerStatus.Stopping, SteamStatus.Unavailable, false);
 
                             await ProcessUtils.SendStop(this.serverProcess);
                         }
@@ -496,8 +489,7 @@ public async Task StopAsync()
                     }
                     finally
                     {
-                        this.Status = ServerStatus.Stopped;
-                        this.Steam = SteamStatus.Unavailable;
+                        UpdateServerStatus(ServerStatus.Stopped, SteamStatus.Unavailable, true);
                     }
                     break;
             }            
@@ -944,5 +936,14 @@ public void ResetModCheckTimer()
         {
             this.lastModStatusQuery = DateTime.MinValue;
         }
+
+        private void UpdateServerStatus(ServerStatus serverStatus, SteamStatus steamStatus, bool sendAlert)
+        {
+            this.Status = serverStatus;
+            this.Steam = steamStatus;
+
+            if (!string.IsNullOrWhiteSpace(Config.Default.Alert_ServerStatusChange) && sendAlert)
+                PluginHelper.Instance.ProcessAlert(AlertType.ServerStatusChange, this.ProfileSnapshot.ProfileName, $"{Config.Default.Alert_ServerStatusChange} {serverStatus}");
+        }
     }
 }
diff --git a/ARK Server Manager/Windows/GlobalSettingsControl.xaml b/ARK Server Manager/Windows/GlobalSettingsControl.xaml
index 94fcc42c..8bc6c762 100644
--- a/ARK Server Manager/Windows/GlobalSettingsControl.xaml	
+++ b/ARK Server Manager/Windows/GlobalSettingsControl.xaml	
@@ -477,6 +477,9 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"/>
@@ -497,6 +500,12 @@
                         <TextBox Grid.Row="5" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_RestartProcessError}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_RestartProcessErrorTooltip}"/>
                         <Label Grid.Row="6" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_UpdateProcessErrorLabel}" VerticalAlignment="Center"/>
                         <TextBox Grid.Row="6" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_UpdateProcessError}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_UpdateProcessErrorTooltip}"/>
+                        <Label Grid.Row="7" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_UpdateResultsLabel}" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="7" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_UpdateResults}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_UpdateResultsTooltip}"/>
+                        <Label Grid.Row="8" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_ServerUpdateLabel}" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="8" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_ServerUpdate}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_ServerUpdateTooltip}"/>
+                        <Label Grid.Row="9" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_ServerStatusChangeLabel}" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="9" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_ServerStatusChange}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_ServerStatusChangeTooltip}"/>
                     </Grid>
                 </GroupBox>
 
diff --git a/ArkData/ArkDataContainerAsync.cs b/ArkData/ArkDataContainerAsync.cs
index 8091911d..28ff48d6 100644
--- a/ArkData/ArkDataContainerAsync.cs
+++ b/ArkData/ArkDataContainerAsync.cs
@@ -90,8 +90,8 @@ public static async Task<ArkDataContainer> CreateAsync(string directory)
             if (!Directory.Exists(directory))
                 throw new DirectoryNotFoundException("The ARK data directory couldn't be found.");
 
-            var playerFiles = Directory.GetFiles(directory).Where(p => p.ToLower().Contains(".arkprofile")).ToArray();
-            var tribeFiles = Directory.GetFiles(directory).Where(p => p.ToLower().Contains(".arktribe")).ToArray();
+            var playerFiles = Directory.GetFiles(directory).Where(p => Path.GetExtension(p).Equals(".arkprofile")).ToArray();
+            var tribeFiles = Directory.GetFiles(directory).Where(p => Path.GetExtension(p).Equals(".arktribe")).ToArray();
 
             if (playerFiles.Length == 0 && tribeFiles.Length == 0)
                 throw new FileLoadException("The directory did not contain any of the parseable files.");
diff --git a/ArkData/ArkDataContainerSync.cs b/ArkData/ArkDataContainerSync.cs
index 53615555..4cea2484 100644
--- a/ArkData/ArkDataContainerSync.cs
+++ b/ArkData/ArkDataContainerSync.cs
@@ -86,8 +86,8 @@ public static ArkDataContainer Create(string directory)
             if (!Directory.Exists(directory))
                 throw new DirectoryNotFoundException("The ARK data directory couldn't be found.");
 
-            var playerFiles = Directory.GetFiles(directory).Where(p => p.ToLower().Contains(".arkprofile")).ToArray();
-            var tribeFiles = Directory.GetFiles(directory).Where(p => p.ToLower().Contains(".arktribe")).ToArray();
+            var playerFiles = Directory.GetFiles(directory).Where(p => Path.GetExtension(p).Equals(".arkprofile")).ToArray();
+            var tribeFiles = Directory.GetFiles(directory).Where(p => Path.GetExtension(p).Equals(".arktribe")).ToArray();
 
             if (playerFiles.Length == 0 && tribeFiles.Length == 0)
                 throw new FileLoadException("The directory did not contain any of the parseable files.");
diff --git a/Plugin.Common/Enums/AlertTypeEnum.cs b/Plugin.Common/Enums/AlertTypeEnum.cs
index 9702f382..2a3c17cb 100644
--- a/Plugin.Common/Enums/AlertTypeEnum.cs
+++ b/Plugin.Common/Enums/AlertTypeEnum.cs
@@ -9,5 +9,6 @@ public enum AlertType
         Startup,
         Backup,
         UpdateResults,
+        ServerStatusChange,
     }
 }

From 24ff6e52339a1ef4d77b0f1128da3c7c2d507487 Mon Sep 17 00:00:00 2001
From: Bletch <bletch1971@hotmail.com>
Date: Tue, 22 Aug 2017 18:31:16 +1000
Subject: [PATCH 4/5] Misc Changes

1. Added a wild dino wipe warning alert to the server startup.
---
 ARK Server Manager/ARK Server Manager.csproj        |  2 +-
 ARK Server Manager/App.config                       |  3 +++
 ARK Server Manager/Config.Designer.cs               | 13 +++++++++++++
 ARK Server Manager/Config.settings                  |  3 +++
 ARK Server Manager/Globalization/en-US/en-US.xaml   |  2 ++
 ARK Server Manager/Lib/ServerApp.cs                 |  6 +++++-
 .../Windows/GlobalSettingsControl.xaml              |  2 ++
 .../Windows/ServerSettingsControl.xaml.cs           |  6 ++++--
 8 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ARK Server Manager/ARK Server Manager.csproj b/ARK Server Manager/ARK Server Manager.csproj
index f6c9fde7..7847e88f 100644
--- a/ARK Server Manager/ARK Server Manager.csproj	
+++ b/ARK Server Manager/ARK Server Manager.csproj	
@@ -31,7 +31,7 @@
     <ProductName>Ark Server Manager</ProductName>
     <PublisherName>Ark Server Manager</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>6</ApplicationRevision>
     <ApplicationVersion>1.0.304.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ARK Server Manager/App.config b/ARK Server Manager/App.config
index c076b870..73e02fc4 100644
--- a/ARK Server Manager/App.config	
+++ b/ARK Server Manager/App.config	
@@ -623,6 +623,9 @@
       <setting name="Alert_UpdateResults" serializeAs="String">
         <value>Update performed, includes:</value>
       </setting>
+      <setting name="Alert_ForceRespawnDinos" serializeAs="String">
+        <value>A wild dino wipe is scheduled after the server starts and may delay login until it is complete. Please be patient.</value>
+      </setting>
     </ARK_Server_Manager.Config>
   </userSettings>
 </configuration>
diff --git a/ARK Server Manager/Config.Designer.cs b/ARK Server Manager/Config.Designer.cs
index 60dc9443..b331d0dd 100644
--- a/ARK Server Manager/Config.Designer.cs	
+++ b/ARK Server Manager/Config.Designer.cs	
@@ -1939,5 +1939,18 @@ public string Alert_UpdateResults {
                 this["Alert_UpdateResults"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("A wild dino wipe is scheduled after the server starts and may delay login until i" +
+            "t is complete. Please be patient.")]
+        public string Alert_ForceRespawnDinos {
+            get {
+                return ((string)(this["Alert_ForceRespawnDinos"]));
+            }
+            set {
+                this["Alert_ForceRespawnDinos"] = value;
+            }
+        }
     }
 }
diff --git a/ARK Server Manager/Config.settings b/ARK Server Manager/Config.settings
index f81de8c8..38da88aa 100644
--- a/ARK Server Manager/Config.settings	
+++ b/ARK Server Manager/Config.settings	
@@ -545,5 +545,8 @@
     <Setting Name="Alert_UpdateResults" Type="System.String" Scope="User">
       <Value Profile="(Default)">Update performed, includes:</Value>
     </Setting>
+    <Setting Name="Alert_ForceRespawnDinos" Type="System.String" Scope="User">
+      <Value Profile="(Default)">A wild dino wipe is scheduled after the server starts and may delay login until it is complete. Please be patient.</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/ARK Server Manager/Globalization/en-US/en-US.xaml b/ARK Server Manager/Globalization/en-US/en-US.xaml
index 5bbb81b6..94e319ce 100644
--- a/ARK Server Manager/Globalization/en-US/en-US.xaml	
+++ b/ARK Server Manager/Globalization/en-US/en-US.xaml	
@@ -389,6 +389,8 @@
     <sys:String x:Key="GlobalSettings_Alerts_ServerUpdateTooltip">This message will be displayed when the game server has been updated.</sys:String>
     <sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeLabel">Server Status Change:</sys:String>
     <sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeTooltip">This message will be displayed when the status of the server changes.</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosLabel">Force Respawn Dinos Warning:</sys:String>
+    <sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosTooltip">This message will be displayed when the server is being started and a wild dino wipe is scheduled.</sys:String>
 
     <!-- 
     Main Window 
diff --git a/ARK Server Manager/Lib/ServerApp.cs b/ARK Server Manager/Lib/ServerApp.cs
index d6c04175..6f1bfce5 100644
--- a/ARK Server Manager/Lib/ServerApp.cs	
+++ b/ARK Server Manager/Lib/ServerApp.cs	
@@ -43,6 +43,7 @@ internal class ProfileSnapshot
             public List<string> ServerModIds;
             public string LastInstalledVersion;
             public int MotDDuration;
+            public bool ForceRespawnDinos;
 
             public string SchedulerKey;
             public bool EnableAutoBackup;
@@ -80,6 +81,7 @@ public static ProfileSnapshot Create(ServerProfile profile)
                     ServerModIds = ModUtils.GetModIdList(profile.ServerModIds),
                     LastInstalledVersion = profile.LastInstalledVersion ?? new Version(0, 0).ToString(),
                     MotDDuration = Math.Max(profile.MOTDDuration, 10),
+                    ForceRespawnDinos = profile.ForceRespawnDinos,
 
                     SchedulerKey = profile.GetProfileKey(),
                     EnableAutoBackup = profile.EnableAutoBackup,
@@ -428,6 +430,8 @@ private void StartServer()
                     SendEmail($"{_profile.ProfileName} server started", Config.Default.Alert_ServerStartedMessage, false);
 
                 ProcessAlert(AlertType.Startup, Config.Default.Alert_ServerStartedMessage);
+                if (_profile.ForceRespawnDinos)
+                    ProcessAlert(AlertType.Startup, Config.Default.Alert_ForceRespawnDinos);
             }
             ExitCode = EXITCODE_NORMALEXIT;
         }
@@ -2388,7 +2392,7 @@ private void LogProfileMessage(string message, bool includeProgressCallback = tr
 
         private void ProcessAlert(AlertType alertType, string alertMessage)
         {
-            if (_pluginHelper == null || !SendAlerts)
+            if (_pluginHelper == null || !SendAlerts || string.IsNullOrWhiteSpace(alertMessage))
                 return;
 
             if (_pluginHelper.ProcessAlert(alertType, _profile?.ProfileName ?? String.Empty, alertMessage))
diff --git a/ARK Server Manager/Windows/GlobalSettingsControl.xaml b/ARK Server Manager/Windows/GlobalSettingsControl.xaml
index 8bc6c762..9c9c2e84 100644
--- a/ARK Server Manager/Windows/GlobalSettingsControl.xaml	
+++ b/ARK Server Manager/Windows/GlobalSettingsControl.xaml	
@@ -506,6 +506,8 @@
                         <TextBox Grid.Row="8" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_ServerUpdate}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_ServerUpdateTooltip}"/>
                         <Label Grid.Row="9" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_ServerStatusChangeLabel}" VerticalAlignment="Center"/>
                         <TextBox Grid.Row="9" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_ServerStatusChange}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_ServerStatusChangeTooltip}"/>
+                        <Label Grid.Row="10" Grid.Column="0" Content="{DynamicResource GlobalSettings_Alerts_ForceRespawnDinosLabel}" VerticalAlignment="Center"/>
+                        <TextBox Grid.Row="10" Grid.Column="1" Margin="1" Text="{Binding CurrentConfig.Alert_ForceRespawnDinos}" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" ToolTip="{DynamicResource GlobalSettings_Alerts_ForceRespawnDinosTooltip}"/>
                     </Grid>
                 </GroupBox>
 
diff --git a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs
index 0a1536da..097087bc 100644
--- a/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
+++ b/ARK Server Manager/Windows/ServerSettingsControl.xaml.cs	
@@ -437,10 +437,12 @@ private async void Start_Click(object sender, RoutedEventArgs e)
                                     return;
                             }
 
+                            await this.Server.StartAsync();
+
                             PluginHelper.Instance.ProcessAlert(AlertType.Startup, this.Settings.ProfileName, Config.Default.Alert_ServerStartedMessage);
+                            if (this.Settings.ForceRespawnDinos)
+                                PluginHelper.Instance.ProcessAlert(AlertType.Startup, this.Settings.ProfileName, Config.Default.Alert_ForceRespawnDinos);
                             await Task.Delay(2000);
-
-                            await this.Server.StartAsync();
                         }
                         else
                         {

From 904b6765a0a9019ef0f2356680f6330c1565db79 Mon Sep 17 00:00:00 2001
From: Bletch <bletch1971@hotmail.com>
Date: Thu, 24 Aug 2017 09:00:57 +1000
Subject: [PATCH 5/5] Version Update

---
 ARK Server Manager/ARK Server Manager.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ARK Server Manager/ARK Server Manager.csproj b/ARK Server Manager/ARK Server Manager.csproj
index 7847e88f..2511a37e 100644
--- a/ARK Server Manager/ARK Server Manager.csproj	
+++ b/ARK Server Manager/ARK Server Manager.csproj	
@@ -31,8 +31,8 @@
     <ProductName>Ark Server Manager</ProductName>
     <PublisherName>Ark Server Manager</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>6</ApplicationRevision>
-    <ApplicationVersion>1.0.304.%2a</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.305.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>false</BootstrapperEnabled>