From 4c09390ac8d2226dbc849eed341b68d238f9375b Mon Sep 17 00:00:00 2001 From: Li Date: Wed, 26 Oct 2022 22:45:22 +1300 Subject: [PATCH] CONTINUE, NOT RETURN!!! --- HorseIsleServer/HISPd/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/LibHISP/Server/GameClient.cs | 4 ++-- HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/MPN00BS/ServerStarter.cs | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 6b66e6f..825b965 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/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.8.3.0")] -[assembly: AssemblyFileVersion("1.8.3.0")] +[assembly: AssemblyVersion("1.8.11.0")] +[assembly: AssemblyFileVersion("1.8.11.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 7766ad7..388d99f 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.3 +Version: 1.8.11 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 3b3410c..4080660 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ 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.8.3.0")] -[assembly: AssemblyFileVersion("1.8.3.0")] +[assembly: AssemblyVersion("1.8.11.0")] +[assembly: AssemblyFileVersion("1.8.11.0")] diff --git a/HorseIsleServer/LibHISP/Server/GameClient.cs b/HorseIsleServer/LibHISP/Server/GameClient.cs index ea1c7f7..314296d 100755 --- a/HorseIsleServer/LibHISP/Server/GameClient.cs +++ b/HorseIsleServer/LibHISP/Server/GameClient.cs @@ -129,7 +129,7 @@ namespace HISP.Server if (GameServer.ServerSocket == null) return; if (eSocket == null) - return; + continue; if (eSocket.RemoteEndPoint == null) continue; new GameClient(eSocket); @@ -139,7 +139,7 @@ namespace HISP.Server return; } while (!GameServer.ServerSocket.AcceptAsync(e)); } - catch (ObjectDisposedException) { } // server shutdown + catch (ObjectDisposedException ex) { Logger.CrashPrint("Server shutdown due to " + ex.Message); } // server shutdown } private void timeoutTimerTick(object state) { diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index d191789..1ba91df 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ 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.8.3.0")] -[assembly: AssemblyFileVersion("1.8.3.0")] +[assembly: AssemblyVersion("1.8.11.0")] +[assembly: AssemblyFileVersion("1.8.11.0")] diff --git a/HorseIsleServer/MPN00BS/ServerStarter.cs b/HorseIsleServer/MPN00BS/ServerStarter.cs index a630d2e..12b5b6d 100755 --- a/HorseIsleServer/MPN00BS/ServerStarter.cs +++ b/HorseIsleServer/MPN00BS/ServerStarter.cs @@ -60,11 +60,11 @@ namespace MPN00BS clientProcess = new Process(); -#if OS_WINDOWS +#if OS_WINDOWS || DEBUG string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe"); #elif OS_LINUX - string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); -#elif OS_MACOS + string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); +#elif OS_MACOS string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "MACOS", "flash.app", "Contents", "MacOS", "Flash Player"); #else MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok); @@ -79,7 +79,7 @@ namespace MPN00BS clientProcess.StartInfo.FileName = executable; #if OS_LINUX || OS_MACOS - clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); + clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); #else clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); #endif @@ -215,7 +215,7 @@ namespace MPN00BS public static void SetBaseDir() { -#if OS_WINDOWS +#if OS_WINDOWS || DEBUG string hispFolder = Environment.GetEnvironmentVariable("APPDATA"); if (hispFolder == null) return;