Skip to content

Commit dfcb953

Browse files
committed
review changes
1 parent 080f2cd commit dfcb953

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

Robust.Server/ServerStatus/StatusHost.Handlers.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ private async Task<bool> HandleStatus(IStatusHandlerContext context)
4848
// Content can override these if it wants (e.g. stealthmins).
4949
["name"] = _serverNameCache,
5050
["players"] = _playerManager.PlayerCount,
51-
["engine_type"] = buildInfo.Engine,
51+
// MV Launcher can filter based on engine
52+
["engine_type"] = buildInfo.EngineType,
5253
["engine"] = buildInfo.EngineVersion,
5354
};
5455

@@ -137,7 +138,7 @@ private JsonObject GetExternalBuildInfo()
137138

138139
return new JsonObject
139140
{
140-
["engine"] = buildInfo.Engine,
141+
["engine_type"] = buildInfo.EngineType,
141142
["engine_version"] = buildInfo.EngineVersion,
142143
["fork_id"] = buildInfo.ForkId,
143144
["version"] = buildInfo.Version,
@@ -164,7 +165,7 @@ private JsonObject GetExternalBuildInfo()
164165
}
165166
return new JsonObject
166167
{
167-
["engine"] = _cfg.GetCVar(CVars.BuildEngine),
168+
["engine_type"] = _cfg.GetCVar(CVars.BuildEngineType),
168169
["engine_version"] = _cfg.GetCVar(CVars.BuildEngineVersion),
169170
["fork_id"] = fork,
170171
["version"] = acm.ManifestHash,

Robust.Shared/CVars.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,8 @@ protected CVars()
612612
/// <summary>
613613
/// Engine type the launcher needs to connect to this server.
614614
/// </summary>
615-
public static readonly CVarDef<string> BuildEngine =
616-
CVarDef.Create("build.engine", "Multiverse");
615+
public static readonly CVarDef<string> BuildEngineType =
616+
CVarDef.Create("build.engine_type", "Multiverse");
617617

618618
/// <summary>
619619
/// Engine version that launcher needs to connect to this server.

Robust.Shared/Utility/GameBuildInformation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal sealed record GameBuildInformation(
77
string? ZipHash,
88
string? ZipDownload,
99
string ForkId,
10-
string Engine,
10+
string EngineType,
1111
string Version,
1212
string? ManifestHash,
1313
string? ManifestUrl,
@@ -19,7 +19,7 @@ public static GameBuildInformation GetBuildInfoFromConfig(IConfigurationManager
1919
var zipHash = cfg.GetCVar(CVars.BuildHash);
2020
var manifestHash = cfg.GetCVar(CVars.BuildManifestHash);
2121
var forkId = cfg.GetCVar(CVars.BuildForkId);
22-
var engine = cfg.GetCVar(CVars.BuildEngine);
22+
var engineType = cfg.GetCVar(CVars.BuildEngineType);
2323
var forkVersion = cfg.GetCVar(CVars.BuildVersion);
2424

2525
var manifestDownloadUrl = Interpolate(cfg.GetCVar(CVars.BuildManifestDownloadUrl));
@@ -46,7 +46,7 @@ public static GameBuildInformation GetBuildInfoFromConfig(IConfigurationManager
4646
zipHash,
4747
zipDownload,
4848
forkId,
49-
engine,
49+
engineType,
5050
forkVersion,
5151
manifestHash,
5252
manifestUrl,

0 commit comments

Comments
 (0)