expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from RAGECOOP/dev-nightly

Browse Source 
Bump to 1.5.4
This commit is contained in:
Sardelka9515
2022-09-07 22:44:48 -07:00
committed by GitHub
parent ba8d525ddf a83821b3d2
commit f28c83ccbd
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RageCoop.Client/Properties/AssemblyInfo.cs
View File

@ -16,7 +16,7 @@ using System.Resources;
// Version informationr(
[assembly: AssemblyVersion("1.5.3.191")]
[assembly: AssemblyFileVersion("1.5.3.191")]
[assembly: AssemblyVersion("1.5.4.1")]
[assembly: AssemblyFileVersion("1.5.4.1")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

1
RageCoop.Client/Util/Util.cs
View File

@ -235,6 +235,7 @@ namespace RageCoop.Client
foreach (var l in lines)
{
var ss = l.Split('=');
ss.ForEach(s => s.Replace(" ", ""));
if (ss.Length > 0 && ss[0] == "ReloadKey")
{
reloadKey = ss[1];

15
RageCoop.Server/Networking/Server.Background.cs
View File

@ -42,6 +42,7 @@ namespace RageCoop.Server
}
}
private IpInfo IpInfo = null;
private bool CanAnnounce = false;
private void Announce()
{
HttpResponseMessage response = null;
@ -78,7 +79,19 @@ namespace RageCoop.Server
Logger?.Error($"MasterServer: {ex.Message}");
}
}
if (!CanAnnounce)
{
var existing = JsonConvert.DeserializeObject<List<ServerInfo>>(HttpHelper.DownloadString(Util.GetFinalRedirect(Settings.MasterServer))).Where(x => x.address == IpInfo.Address).FirstOrDefault();
if(existing != null)
{
Logger.Warning("Server info already present in master server, waiting for 10 seconds...");
return;
}
else
{
CanAnnounce = true;
}
}
try
{
Security.GetPublicKey(out var pModulus, out var pExpoenet);

4
RageCoop.Server/Properties/AssemblyInfo.cs
View File

@ -15,7 +15,7 @@ using System.Resources;
[assembly: AssemblyCulture("")]
// Version information
[assembly: AssemblyVersion("1.5.3.178")]
[assembly: AssemblyFileVersion("1.5.3.178")]
[assembly: AssemblyVersion("1.5.4.0")]
[assembly: AssemblyFileVersion("1.5.4.0")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

5
RageCoop.Server/Util.cs
View File

@ -1,13 +1,12 @@
using Lidgren.Network;
global using System.Collections.Generic;
using Lidgren.Network;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Xml;
using System.Xml.Serialization;
namespace RageCoop.Server
{
internal static partial class Util