Skip to content

FastTravelPlugin: Added missing MinimumCSPVersion check #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
C1XTZ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FastTravelPlugin: Added missing MinimumCSPVersion check #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions FastTravelPlugin/FastTravelPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ public FastTravelPlugin(FastTravelConfiguration configuration,
{
_aiSpline = aiSpline ?? throw new ConfigurationException("FastTravelPlugin does not work with AI traffic disabled");

if (configuration.DisableCollisions && serverConfiguration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_8)
{
throw new ConfigurationException("FastTravelPlugin needs a minimum required CSP version of 0.2.8 (3424)");
}
var requiredVersion = configuration.DisableCollisions ? CSPVersion.V0_2_8 : CSPVersion.V0_2_0;
var requiredVersionString = configuration.DisableCollisions ? "0.2.8 (3424)" : "0.2.0 (2651)";
var minimumVersion = serverConfiguration.CSPTrackOptions.MinimumCSPVersion ?? throw new ConfigurationException($"FastTravelPlugin needs a minimum required CSP version of {requiredVersionString}");

if (!configuration.DisableCollisions && serverConfiguration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_0)
if (minimumVersion < requiredVersion)
{
throw new ConfigurationException("FastTravelPlugin needs a minimum required CSP version of 0.2.0 (2651)");
throw new ConfigurationException($"FastTravelPlugin needs a minimum required CSP version of {requiredVersionString}");
}

if (!serverConfiguration.Extra.EnableClientMessages)
Expand Down
2 changes: 2 additions & 0 deletions FastTravelPlugin/lua/fasttravel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ local function window_FastTravelDebug()
if ui.checkbox("Use Group Draw Mode", debugUseGroupDrawMode) then
debugUseGroupDrawMode = not debugUseGroupDrawMode
config.useGroupDrawMode = debugUseGroupDrawMode
getTeleports()
end

if not debugUseGroupDrawMode then
Expand All @@ -346,6 +347,7 @@ local function window_FastTravelDebug()
debugHideUntypedPoints, config.hideUntypedPoints = debugOrigHideUntypedPoints, debugOrigHideUntypedPoints
debugUseGroupDrawMode, config.useGroupDrawMode = debugOrigUseGroupDrawMode, debugOrigUseGroupDrawMode
debugDistanceModeRange, config.distanceModeRange = debugOrigDistanceModeRange, debugOrigDistanceModeRange
getTeleports()
end
end)

Expand Down