Added config support for GameServer port and ip (basically, one serve…

…r has the node.js server, the other has scpsl)
VirtualBrightPlayz · Nov 17, 2018 · 100fd72 · 100fd72
1 parent 0bb9b87
commit 100fd72
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/.vs/Mod8/v15/.suo b/.vs/Mod8/v15/.suo
diff --git a/.vs/Mod8/v15/Server/sqlite3/db.lock b/.vs/Mod8/v15/Server/sqlite3/db.lock
diff --git a/.vs/Mod8/v15/Server/sqlite3/storage.ide b/.vs/Mod8/v15/Server/sqlite3/storage.ide
diff --git a/Mod8/Mod8.cs b/Mod8/Mod8.cs
@@ -30,7 +30,7 @@ public override void OnEnable()
             this.Info("Mod8 plugin enabled.");
             this.Info("Connecting to node.js server");
             tcp = new TcpClient();
-            tcp.Connect(this.GetConfigString("tcpmapip"), this.GetConfigInt("tcpmapport"));
+            tcp.Connect(ConfigManager.Manager.Config.GetStringValue("tcpmapip", "127.0.0.1"), ConfigManager.Manager.Config.GetIntValue("tcpmapport", 8080));
             s = tcp.GetStream();
             rm = new RoomManager();
         }

diff --git a/Mod8/Mod8EventHandler.cs b/Mod8/Mod8EventHandler.cs
@@ -29,12 +29,12 @@ public Mod8EventHandler(Plugin mod8)
 
         void IEventHandlerPlayerJoin.OnPlayerJoin(PlayerJoinEvent ev)
         {
-            if (keys.ContainsKey(ev.Player.SteamId))
+            /*if (keys.ContainsKey(ev.Player.SteamId))
             {
                 ev.Player.SendConsoleMessage("Your SteamID is: " + ev.Player.SteamId);
                 ev.Player.SendConsoleMessage("Your key is: " + keys[ev.Player.SteamId]);
                 return;
-            }
+            }*/
             string newkey = "";
             for (int i = 0; i < 5; i++)
             {
@@ -87,6 +87,14 @@ void IEventHandlerFixedUpdate.OnFixedUpdate(FixedUpdateEvent ev)
                 {
                     var mod8 = (Mod8)plugin;
 
+                    if (!mod8.tcp.Connected || !mod8.s.CanWrite)
+                    {
+                        mod8.tcp.Close();
+                        mod8.tcp = new System.Net.Sockets.TcpClient();
+                        mod8.tcp.Connect(ConfigManager.Manager.Config.GetStringValue("tcpmapip", "127.0.0.1"), ConfigManager.Manager.Config.GetIntValue("tcpmapport", 8080));
+                        mod8.s = mod8.tcp.GetStream();
+                    }
+
                     string str = string.Empty;
                     str += " { ";
                     str += " \"lczrooms\": [ ";
@@ -173,6 +181,7 @@ void IEventHandlerFixedUpdate.OnFixedUpdate(FixedUpdateEvent ev)
                     {
                         var play = pls[i];
                         GameObject obj = (GameObject)pls[i].GetGameObject();
+
                         str += " { ";
 
                         str += " \"posx\": \"" + obj.transform.position.x.ToString() + "\", ";
@@ -187,7 +196,14 @@ void IEventHandlerFixedUpdate.OnFixedUpdate(FixedUpdateEvent ev)
                         str += " \"role\": \"" + play.TeamRole.Role.ToString() + "\", ";
                         str += " \"ip\": \"" + play.IpAddress + "\", ";
                         str += " \"steamid\": \"" + play.SteamId + "\", ";
-                        str += " \"key\": \"" + keys[play.SteamId] + "\", ";
+                        if (keys.ContainsKey(play.SteamId))
+                        {
+                            str += " \"key\": \"" + keys[play.SteamId] + "\", ";
+                        }
+                        else
+                        {
+                            str += " \"key\": \"errorfindingkey\", ";
+                        }
                         str += " \"name\": \"" + play.Name + "\" ";
                         if (i + 1 >= pls.Count)
                         {
@@ -208,7 +224,7 @@ void IEventHandlerFixedUpdate.OnFixedUpdate(FixedUpdateEvent ev)
                 }
                 catch (Exception e)
                 {
-                    plugin.Info(e.Message);
+                    plugin.Info(e.StackTrace);
                 }
             }
         }