v1.4.1

- Fixed #4 - Fixed Rust server Windows Firewall bug - Fixed workshop map bug
WindowsGSM · Dec 13, 2019 · dd6a6a3 · dd6a6a3
1 parent 3655b7a
commit dd6a6a3
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.vs
+WindowsGSM/bin/
+WindowsGSM/obj/
diff --git a/WindowsGSM/GameServer/CS.cs b/WindowsGSM/GameServer/CS.cs
@@ -60,10 +60,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game cstrike";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/CSCZ.cs b/WindowsGSM/GameServer/CSCZ.cs
@@ -57,10 +57,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game czero";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/CSGO.cs b/WindowsGSM/GameServer/CSGO.cs
@@ -55,10 +55,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game csgo";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers_override {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/Check/CrashDetection.cs b/WindowsGSM/GameServer/Check/CrashDetection.cs
diff --git a/WindowsGSM/GameServer/GMOD.cs b/WindowsGSM/GameServer/GMOD.cs
@@ -53,10 +53,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game garrysmod";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/HL2DM.cs b/WindowsGSM/GameServer/HL2DM.cs
@@ -49,10 +49,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game hl2mp";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/L4D2.cs b/WindowsGSM/GameServer/L4D2.cs
@@ -49,10 +49,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game left4dead2";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/GameServer/RUST.cs b/WindowsGSM/GameServer/RUST.cs
@@ -78,7 +78,7 @@ public void SetParameter(string ip, string port, string map, string maxplayers)
 
             if (!File.Exists(rustPath))
             {
-                return (null, "srcds.exe not found (" + rustPath + ")", "");
+                return (null, "RustDedicated.exe not found (" + rustPath + ")", "");
             }
 
             if (string.IsNullOrWhiteSpace(Param))
@@ -92,7 +92,7 @@ public void SetParameter(string ip, string port, string map, string maxplayers)
                 return (null, "", "server.cfg not found (" + serverConfigPath + ")");
             }
 
-            WindowsFirewall firewall = new WindowsFirewall("srcds.exe", rustPath);
+            WindowsFirewall firewall = new WindowsFirewall("RustDedicated.exe", rustPath);
             if (!firewall.IsRuleExist())
             {
                 firewall.AddRule();

diff --git a/WindowsGSM/GameServer/TF2.cs b/WindowsGSM/GameServer/TF2.cs
@@ -56,10 +56,10 @@ public void SetParameter(string ip, string port, string map, string maxplayers,
             Param = "-console -game tf";
             Param += String.Format("{0}", String.IsNullOrEmpty(ip) ? "" : $" -ip {ip}");
             Param += String.Format("{0}", String.IsNullOrEmpty(port) ? "" : $" -port {port}");
-            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
             Param += String.Format("{0}", String.IsNullOrEmpty(maxplayers) ? "" : $" -maxplayers {maxplayers}");
             Param += String.Format("{0}", String.IsNullOrEmpty(gslt) ? "" : $" +sv_setsteamaccount {gslt}");
             Param += String.Format("{0}", String.IsNullOrEmpty(additional) ? "" : $" {additional}");
+            Param += String.Format("{0}", String.IsNullOrEmpty(map) ? "" : $" +map {map}");
         }
 
         public (Process Process, string Error, string Notice) Start()

diff --git a/WindowsGSM/MainWindow.xaml.cs b/WindowsGSM/MainWindow.xaml.cs
@@ -52,7 +52,7 @@ private enum ServerStatus
             Restoring = 11
         }
 
-        public static readonly string WGSM_VERSION = "v1.4.0";
+        public static readonly string WGSM_VERSION = "v1.4.1";
         public static readonly int MAX_SERVER = 100;
         public static readonly string WGSM_PATH = Process.GetCurrentProcess().MainModule.FileName.Replace(@"\WindowsGSM.exe", "");
         //public static readonly string WGSM_PATH = @"D:\WindowsGSMtest2";
@@ -964,42 +964,34 @@ private async Task<bool> GameServer_Delete(Function.ServerTable server)
 
         private async void StartServerCrashDetector(Function.ServerTable server)
         {
-            GameServer.Check.CrashDetection detector = new GameServer.Check.CrashDetection();
+            Process p = g_Process[Int32.Parse(server.ID)];
 
-            if (await detector.IsServerCrashed(g_Process[Int32.Parse(server.ID)], server.Game))
+            while (g_iServerStatus[Int32.Parse(server.ID)] == ServerStatus.Started)
             {
-                g_iServerStatus[Int32.Parse(server.ID)] = ServerStatus.Stopped;
-                Log(server.ID, "Server: Crashed");
-                //Log(server.ID, "[WARNING] Exit Code: " + g_Process[Int32.Parse(server.ID)].ExitCode.ToString());
-                SetServerStatus(server, "Stopped");
-
-                g_Process[Int32.Parse(server.ID)] = null;
-
-                if (g_bDiscordAlert[Int32.Parse(server.ID)])
+                if (p != null && p.HasExited)
                 {
-                    Discord.Webhook webhook = new Discord.Webhook(g_DiscordWebhook[Int32.Parse(server.ID)]);
-                    await webhook.Send(server.ID, server.Game, "Crashed", server.Name, server.IP, server.Port);
-                }
+                    g_iServerStatus[Int32.Parse(server.ID)] = ServerStatus.Stopped;
+                    Log(server.ID, "Server: Crashed");
+                    //Log(server.ID, "[WARNING] Exit Code: " + g_Process[Int32.Parse(server.ID)].ExitCode.ToString());
+                    SetServerStatus(server, "Stopped");
 
-                if (g_bAutoRestart[Int32.Parse(server.ID)])
-                {
-                    GameServer_Start(server);
-                }
-            }
-            else if (g_iServerStatus[Int32.Parse(server.ID)] == ServerStatus.Started && g_Process[Int32.Parse(server.ID)].HasExited)
-            {
-                g_iServerStatus[Int32.Parse(server.ID)] = ServerStatus.Stopped;
-                Log(server.ID, "Server: Stopped");
-                Log(server.ID, "[Notice] Server stopped externally");
-                SetServerStatus(server, "Stopped");
+                    g_Process[Int32.Parse(server.ID)] = null;
 
-                g_Process[Int32.Parse(server.ID)] = null;
+                    if (g_bDiscordAlert[Int32.Parse(server.ID)])
+                    {
+                        Discord.Webhook webhook = new Discord.Webhook(g_DiscordWebhook[Int32.Parse(server.ID)]);
+                        await webhook.Send(server.ID, server.Game, "Crashed", server.Name, server.IP, server.Port);
+                    }
 
-                if (g_bDiscordAlert[Int32.Parse(server.ID)])
-                {
-                    Discord.Webhook webhook = new Discord.Webhook(g_DiscordWebhook[Int32.Parse(server.ID)]);
-                    await webhook.Send(server.ID, server.Game, "Stopped", server.Name, server.IP, server.Port);
+                    if (g_bAutoRestart[Int32.Parse(server.ID)])
+                    {
+                        GameServer_Start(server);
+                    }
+
+                    break;
                 }
+
+                await Task.Delay(1000);
             }
         }
 

diff --git a/WindowsGSM/Properties/AssemblyInfo.cs b/WindowsGSM/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/WindowsGSM/WindowsGSM.csproj b/WindowsGSM/WindowsGSM.csproj
@@ -170,7 +170,6 @@
     </Compile>
     <Compile Include="Function\Path.cs" />
     <Compile Include="Discord\Webhook.cs" />
-    <Compile Include="GameServer\Check\CrashDetection.cs" />
     <Compile Include="GameServer\GMOD.cs" />
     <Compile Include="GameServer\MCPE.cs" />
     <Compile Include="GameServer\RUST.cs" />