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
This commit is contained in:
xEntenKoeniqx
2022-11-19 00:01:38 +01:00
parent 745b212b42
commit 478305112f
4 changed files with 16 additions and 12 deletions

View File

@ -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; }

View File

@ -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)

View File

@ -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")]
[assembly: AssemblyVersion("1.6.0.4")]
[assembly: AssemblyFileVersion("1.6.0.4")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

View File

@ -3,7 +3,7 @@
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyVersion></AssemblyVersion>
<FileVersion></FileVersion>
<RepositoryUrl>https://github.com/RAGECOOP/RAGECOOP-V</RepositoryUrl>