From 6627ca5dc4f2b4331a5ee758f2a707104e65e96d Mon Sep 17 00:00:00 2001
From: Li <li@silica.codes>
Date: Sun, 17 Jul 2022 23:01:47 +1200
Subject: [PATCH] Update dependancies

---
 HorseIsleServer/HISPd/HISPd.csproj               |  3 +++
 HorseIsleServer/HISPd/Resources/DEBIAN/control   |  2 +-
 HorseIsleServer/LibHISP/LibHISP.csproj           |  4 ++--
 .../LibHISP/Properties/AssemblyInfo.cs           |  4 ++--
 HorseIsleServer/LibHISP/Server/Entry.cs          | 16 ++++++++++++++--
 HorseIsleServer/LibHISP/Server/GameServer.cs     | 15 +++++++++++----
 HorseIsleServer/N00BS/Properties/AssemblyInfo.cs |  4 ++--
 7 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj
index 21bbc33..9c21a54 100644
--- a/HorseIsleServer/HISPd/HISPd.csproj
+++ b/HorseIsleServer/HISPd/HISPd.csproj
@@ -23,6 +23,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.7" />
+  </ItemGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control
index f1968ea..3bbd834 100644
--- a/HorseIsleServer/HISPd/Resources/DEBIAN/control
+++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: hisp
-Version: 1.7.87
+Version: 1.7.90
 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
 Maintainer: Li
 Homepage: https://islehorse.com
diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj
index 6f5d944..ded0f51 100644
--- a/HorseIsleServer/LibHISP/LibHISP.csproj
+++ b/HorseIsleServer/LibHISP/LibHISP.csproj
@@ -28,9 +28,9 @@
     </ContentWithTargetPath>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-preview.6.22329.4" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.7" />
     <PackageReference Include="MySqlConnector" Version="2.1.11" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
index 1500ca1..22be50d 100644
--- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
+++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.7.87.0")]
-[assembly: AssemblyFileVersion("1.7.87.0")]
+[assembly: AssemblyVersion("1.7.90.0")]
+[assembly: AssemblyFileVersion("1.7.90.0")]
diff --git a/HorseIsleServer/LibHISP/Server/Entry.cs b/HorseIsleServer/LibHISP/Server/Entry.cs
index b4032f0..11c38b4 100644
--- a/HorseIsleServer/LibHISP/Server/Entry.cs
+++ b/HorseIsleServer/LibHISP/Server/Entry.cs
@@ -9,6 +9,7 @@ using HISP.Security;
 using System;
 using System.Diagnostics;
 using System.Threading;
+using System.IO;
 
 namespace HISP.Server
 {
@@ -64,11 +65,22 @@ namespace HISP.Server
         {
             Exception execpt = (Exception)e.ExceptionObject;
 
+
             Logger.ErrorPrint("HISP HAS CRASHED :(");
             Logger.ErrorPrint("Unhandled Exception: " + execpt.ToString());
             Logger.ErrorPrint(execpt.StackTrace);
-            
-            new EventWaitHandle(false, EventResetMode.ManualReset).WaitOne();
+
+            try
+            {
+                File.AppendAllText("crashlog.txt", "HISP HAS CRASHED :(\n");
+                File.AppendAllText("crashlog.txt", "Unhandled Exception: " + execpt.ToString() + "\n");
+                File.AppendAllText("crashlog.txt", execpt.StackTrace + "\n");
+            }
+            catch (Exception) { };
+
+            GameServer.ShutdownServer();
+            Thread.Sleep(5000);
+            Environment.Exit(1);
         }
     }
 }
diff --git a/HorseIsleServer/LibHISP/Server/GameServer.cs b/HorseIsleServer/LibHISP/Server/GameServer.cs
index 3efd8fe..db7342b 100644
--- a/HorseIsleServer/LibHISP/Server/GameServer.cs
+++ b/HorseIsleServer/LibHISP/Server/GameServer.cs
@@ -8259,10 +8259,17 @@ namespace HISP.Server
         public static void ShutdownServer()
         {
             Logger.InfoPrint("Shutting down.");
-            GameClient.OnShutdown();
-            GameServer.OnShutdown();
-            Database.OnShutdown();
-            Entry.OnShutdown();
+            try
+            {
+                GameClient.OnShutdown();
+                GameServer.OnShutdown();
+                Database.OnShutdown();
+                Entry.OnShutdown();
+            }
+            catch (Exception)
+            {
+                Environment.Exit(1);
+            }
         }
 
         public static void StartServer()
diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs
index 74b7bc6..c62df16 100644
--- a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs
+++ b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.87.0")]
-[assembly: AssemblyFileVersion("1.7.87.0")]
+[assembly: AssemblyVersion("1.7.90.0")]
+[assembly: AssemblyFileVersion("1.7.90.0")]