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

Changed some variables from ServerInfo to an integer. .NET updated to version 7.0

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Networking/ServerInfo.cs
View File

@ -10,11 +10,11 @@ namespace RageCoop.Core
{ {
#pragma warning disable 1591 #pragma warning disable 1591
public string address { get; set; } public string address { get; set; }
public string port { get; set; } public int port { get; set; }
public string name { get; set; } public string name { get; set; }
public string version { get; set; } public string version { get; set; }
public string players { get; set; } public int players { get; set; }
public string maxPlayers { get; set; } public int maxPlayers { get; set; }
public string country { get; set; } public string country { get; set; }
public string description { get; set; } public string description { get; set; }
public string website { get; set; } public string website { get; set; }

8
Server/Networking/Server.Background.cs
View File

@ -98,12 +98,12 @@ public partial class Server
var serverInfo = new ServerInfo var serverInfo = new ServerInfo
{ {
address = IpInfo.Address, address = IpInfo.Address,
port = Settings.Port.ToString(), port = Settings.Port,
country = IpInfo.Country, country = IpInfo.Country,
name = Settings.Name, name = Settings.Name,
version = Version.ToString(), version = Version.ToString(),
players = MainNetServer.ConnectionsCount.ToString(), players = MainNetServer.ConnectionsCount,
maxPlayers = Settings.MaxPlayers.ToString(), maxPlayers = Settings.MaxPlayers,
description = Settings.Description, description = Settings.Description,
website = Settings.Website, website = Settings.Website,
gameMode = Settings.GameMode, gameMode = Settings.GameMode,
@ -112,7 +112,7 @@ public partial class Server
useZT = Settings.UseZeroTier, useZT = Settings.UseZeroTier,
ztID = Settings.UseZeroTier ? Settings.ZeroTierNetworkID : "", ztID = Settings.UseZeroTier ? Settings.ZeroTierNetworkID : "",
ztAddress = Settings.UseZeroTier 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", : "0.0.0.0",
publicKeyModulus = Convert.ToBase64String(pModulus), publicKeyModulus = Convert.ToBase64String(pModulus),
publicKeyExponent = Convert.ToBase64String(pExpoenet) publicKeyExponent = Convert.ToBase64String(pExpoenet)

12
Server/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,7 @@
using System.Reflection; 
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Resources; using System.Resources;
// General Information // General Information
@ -12,6 +15,7 @@ using System.Resources;
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Version information // Version information
[assembly: AssemblyVersion("1.6.0.3")] [assembly: AssemblyVersion("1.6.0.4")]
[assembly: AssemblyFileVersion("1.6.0.3")] [assembly: AssemblyFileVersion("1.6.0.4")]
[assembly: NeutralResourcesLanguageAttribute("en-US")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )]

2
Server/RageCoop.Server.csproj
View File

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