From 478305112f88c4fc248bb8240f30630566354bcc Mon Sep 17 00:00:00 2001 From: xEntenKoeniqx <109136581+xEntenKoeniqx@users.noreply.github.com> Date: Sat, 19 Nov 2022 00:01:38 +0100 Subject: [PATCH] Changed some variables from `ServerInfo` to an integer. `.NET` updated to version 7.0 Not compatible with the current MasterServer. `https://test.ragecoop.online/` is compatible --- Core/Networking/ServerInfo.cs | 6 +++--- Server/Networking/Server.Background.cs | 8 ++++---- Server/Properties/AssemblyInfo.cs | 12 ++++++++---- Server/RageCoop.Server.csproj | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Core/Networking/ServerInfo.cs b/Core/Networking/ServerInfo.cs index 836769b..90455e0 100644 --- a/Core/Networking/ServerInfo.cs +++ b/Core/Networking/ServerInfo.cs @@ -10,11 +10,11 @@ namespace RageCoop.Core { #pragma warning disable 1591 public string address { get; set; } - public string port { get; set; } + public int port { get; set; } public string name { get; set; } public string version { get; set; } - public string players { get; set; } - public string maxPlayers { get; set; } + public int players { get; set; } + public int maxPlayers { get; set; } public string country { get; set; } public string description { get; set; } public string website { get; set; } diff --git a/Server/Networking/Server.Background.cs b/Server/Networking/Server.Background.cs index 88d41fa..5bd6e56 100644 --- a/Server/Networking/Server.Background.cs +++ b/Server/Networking/Server.Background.cs @@ -98,12 +98,12 @@ public partial class Server var serverInfo = new ServerInfo { address = IpInfo.Address, - port = Settings.Port.ToString(), + port = Settings.Port, country = IpInfo.Country, name = Settings.Name, version = Version.ToString(), - players = MainNetServer.ConnectionsCount.ToString(), - maxPlayers = Settings.MaxPlayers.ToString(), + players = MainNetServer.ConnectionsCount, + maxPlayers = Settings.MaxPlayers, description = Settings.Description, website = Settings.Website, gameMode = Settings.GameMode, @@ -112,7 +112,7 @@ public partial class Server useZT = Settings.UseZeroTier, ztID = Settings.UseZeroTier ? Settings.ZeroTierNetworkID : "", ztAddress = Settings.UseZeroTier - ? ZeroTierHelper.Networks[Settings.ZeroTierNetworkID].Addresses.Where(x => !x.Contains(":")).First() + ? ZeroTierHelper.Networks[Settings.ZeroTierNetworkID].Addresses.Where(x => !x.Contains(':')).First() : "0.0.0.0", publicKeyModulus = Convert.ToBase64String(pModulus), publicKeyExponent = Convert.ToBase64String(pExpoenet) diff --git a/Server/Properties/AssemblyInfo.cs b/Server/Properties/AssemblyInfo.cs index 11f74f4..194c720 100644 --- a/Server/Properties/AssemblyInfo.cs +++ b/Server/Properties/AssemblyInfo.cs @@ -1,4 +1,7 @@ -using System.Reflection; + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Resources; // General Information @@ -12,6 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.6.0.3")] -[assembly: AssemblyFileVersion("1.6.0.3")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] \ No newline at end of file +[assembly: AssemblyVersion("1.6.0.4")] +[assembly: AssemblyFileVersion("1.6.0.4")] +[assembly: NeutralResourcesLanguageAttribute( "en-US" )] + diff --git a/Server/RageCoop.Server.csproj b/Server/RageCoop.Server.csproj index ecc59f5..76af5b7 100644 --- a/Server/RageCoop.Server.csproj +++ b/Server/RageCoop.Server.csproj @@ -3,7 +3,7 @@ false Exe - net6.0 + net7.0 https://github.com/RAGECOOP/RAGECOOP-V