Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

fixed hanging

This commit is contained in:
Bitl 2022-08-04 16:27:20 -07:00
parent d54bd58481
commit c512e7f385
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -2293,10 +2293,8 @@ public class GlobalFuncs
case ScriptType.Server: case ScriptType.Server:
#if LAUNCHER #if LAUNCHER
PingMasterServer(true, "Server will now display on the defined master server.", box); PingMasterServer(true, "Server will now display on the defined master server.", box);
ConsolePrint("Your server's ID is " + GlobalVars.ServerID, 4, box);
#elif CMD #elif CMD
PingMasterServer(true, "Server will now display on the defined master server."); PingMasterServer(true, "Server will now display on the defined master server.");
ConsolePrint("Your server's ID is " + GlobalVars.ServerID, 4);
#endif #endif
goto default; goto default;
default: default:
@ -2341,12 +2339,10 @@ public class GlobalFuncs
public static void PingMasterServer(bool online, string reason) public static void PingMasterServer(bool online, string reason)
#endif #endif
{ {
string pingURL = "";
if (online) if (online)
{ {
GlobalVars.ServerID = SecurityFuncs.RandomString(30) + SecurityFuncs.GenerateRandomNumber(); GlobalVars.ServerID = SecurityFuncs.RandomString(30) + SecurityFuncs.GenerateRandomNumber();
pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress + GlobalVars.PingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
"/list.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName + "/list.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName +
"&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) + "&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) +
"&port=" + GlobalVars.UserConfiguration.RobloxPort + "&port=" + GlobalVars.UserConfiguration.RobloxPort +
@ -2356,7 +2352,7 @@ public class GlobalFuncs
} }
else else
{ {
pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress + GlobalVars.PingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
"/delist.php?id=" + GlobalVars.ServerID; "/delist.php?id=" + GlobalVars.ServerID;
GlobalVars.ServerID = "N/A"; GlobalVars.ServerID = "N/A";
} }
@ -2366,17 +2362,46 @@ public class GlobalFuncs
#elif CMD #elif CMD
ConsolePrint("Pinging master server. " + reason, 4); ConsolePrint("Pinging master server. " + reason, 4);
#endif #endif
string response = HttpGet(pingURL);
#if LAUNCHER #if LAUNCHER
ConsolePrint(response, response.Contains("ERROR:") ? 2 : 4, box); Task.Factory.StartNew(() => TryPing(box));
#else
Task.Factory.StartNew(() => TryPing());
#endif
}
#if LAUNCHER
public static void TryPing(RichTextBox box)
#else
private static void TryPing()
#endif
{
string response = HttpGet(GlobalVars.PingURL);
if (!string.IsNullOrWhiteSpace(response))
{
#if LAUNCHER
ConsolePrint(response, response.Contains("ERROR:") ? 2 : 4, box);
#elif CMD #elif CMD
ConsolePrint(response, response.Contains("ERROR:") ? 2 : 4); ConsolePrint(response, response.Contains("ERROR:") ? 2 : 4);
#endif #endif
if (response.Contains("ERROR:")) if (response.Contains("ERROR:"))
{ {
GlobalVars.ServerID = "N/A"; GlobalVars.ServerID = "N/A";
}
} }
if (GlobalVars.ServerID == "N/A")
{
#if LAUNCHER
ConsolePrint("Your server's ID is " + GlobalVars.ServerID, 4, box);
#elif CMD
ConsolePrint("Your server's ID is " + GlobalVars.ServerID, 4);
#endif
}
GlobalVars.PingURL = "";
} }
public static void OpenClient(ScriptType type, string rbxexe, string args, string clientname, string mapname, EventHandler e, bool customization = false) public static void OpenClient(ScriptType type, string rbxexe, string args, string clientname, string mapname, EventHandler e, bool customization = false)

1
Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs
View File

@ -97,6 +97,7 @@ public static class GlobalVars
public static int ValidatedExtraFiles = 0; public static int ValidatedExtraFiles = 0;
public static bool NoFileList = false; public static bool NoFileList = false;
public static string ServerID = "N/A"; public static string ServerID = "N/A";
public static string PingURL = "";
#endregion #endregion
} }
#endregion #endregion