space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix replicated & archived client-settable cvars (#3454)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-23 13:11:19 +13:00
committed by GitHub
parent 54a29a030e
commit 7e9f3dd5e6
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Robust.Shared/CVars.cs
View File

@@ -127,13 +127,13 @@ namespace Robust.Shared
/// If off, simulation input commands will not fire and most entity methods will not run update.
/// </remarks>
public static readonly CVarDef<bool> NetPredict =
CVarDef.Create("net.predict", true, CVar.CLIENTONLY);
CVarDef.Create("net.predict", true, CVar.CLIENTONLY | CVar.ARCHIVE);
/// <summary>
/// Extra amount of ticks to run-ahead for prediction on the client.
/// </summary>
public static readonly CVarDef<int> NetPredictTickBias =
CVarDef.Create("net.predict_tick_bias", 1, CVar.CLIENTONLY);
CVarDef.Create("net.predict_tick_bias", 1, CVar.CLIENTONLY | CVar.ARCHIVE);
// On Windows we default this to 16ms lag bias, to account for time period lag in the Lidgren thread.
// Basically due to how time periods work on Windows, messages are (at worst) time period-delayed when sending.
@@ -147,10 +147,10 @@ namespace Robust.Shared
public static readonly CVarDef<float> NetPredictLagBias = CVarDef.Create(
"net.predict_lag_bias",
OperatingSystem.IsWindows() ? 0.016f : 0,
CVar.CLIENTONLY);
CVar.CLIENTONLY | CVar.ARCHIVE);
public static readonly CVarDef<int> NetStateBufMergeThreshold =
CVarDef.Create("net.state_buf_merge_threshold", 5, CVar.ARCHIVE);
CVarDef.Create("net.state_buf_merge_threshold", 5, CVar.CLIENTONLY | CVar.ARCHIVE);
/// <summary>
/// Whether to cull entities sent to clients from the server.
@@ -173,7 +173,7 @@ namespace Robust.Shared
/// spawning isn't hot garbage, this can be increased.
/// </summary>
public static readonly CVarDef<int> NetPVSEntityBudget =
CVarDef.Create("net.pvs_budget", 50, CVar.ARCHIVE | CVar.REPLICATED);
CVarDef.Create("net.pvs_budget", 50, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
/// <summary>
/// This limits the number of entities that can re-enter a client's view in a single game state. This exists to
@@ -181,7 +181,7 @@ namespace Robust.Shared
/// tick. Ideally this would just be handled client-side somehow.
/// </summary>
public static readonly CVarDef<int> NetPVSEntityEnterBudget =
CVarDef.Create("net.pvs_enter_budget", 200, CVar.ARCHIVE | CVar.REPLICATED);
CVarDef.Create("net.pvs_enter_budget", 200, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
/// <summary>
/// The amount of pvs-exiting entities that a client will process in a single tick.

5
Robust.Shared/Configuration/CVar.cs
View File

@@ -66,5 +66,10 @@ namespace Robust.Shared.Configuration
/// This currently hides the content of the cvar in the "cvar" command completions.
/// </remarks>
CONFIDENTIAL = 256,
/// <summary>
/// Only the client can change this variable.
/// </summary>
CLIENT = 512,
}
}

17
Robust.Shared/Configuration/NetConfigurationManager.cs
View File

@@ -203,6 +203,15 @@ namespace Robust.Shared.Configuration
// Server sent us a CVar update.
foreach (var (name, value) in networkedVars)
{
if (!_configVars.TryGetValue(name, out var cVar))
{
_sawmill.Warning($"{msgChannel} tried to replicate an unknown CVar '{name}.'");
continue;
}
if ((cVar.Flags & CVar.CLIENT) != 0)
continue; // ignore the server specified value.
// Actually set the CVar
SetCVarInternal(name, value, tick);
@@ -289,6 +298,14 @@ namespace Robust.Shared.Configuration
return;
}
}
else
{
if ((cVar.Flags & CVar.CLIENT) != 0)
{
_sawmill.Warning($"Only clients can change '{name}'.");
return;
}
}
}
else
{