CONTINUE, NOT RETURN!!!

This commit is contained in:
Li 2022-10-26 22:45:22 +13:00
parent 3e3d840ce6
commit 4c09390ac8
6 changed files with 14 additions and 14 deletions

View file

@ -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")]

View file

@ -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

View file

@ -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")]

View file

@ -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)
{

View file

@ -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")]

View file

@ -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;