tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable gamemode vote if only one available (#11915)

Browse Source 
* disable vote on condition

* move to new method

* still allow vote if current mode is different from available
This commit is contained in:
corentt
2022-10-15 06:10:10 +02:00
committed by GitHub
parent 0b38589728
commit 4159638300
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
View File

@@ -103,21 +103,7 @@ namespace Content.Server.Voting.Managers
private void CreatePresetVote(IPlayerSession? initiator) private void CreatePresetVote(IPlayerSession? initiator)
{ {
var presets = new Dictionary<string, string>(); var presets = GetGamePresets();
foreach (var preset in _prototypeManager.EnumeratePrototypes<GamePresetPrototype>())
{
if(!preset.ShowInVote)
continue;
if(_playerManager.PlayerCount < (preset.MinPlayers ?? int.MinValue))
continue;
if(_playerManager.PlayerCount > (preset.MaxPlayers ?? int.MaxValue))
continue;
presets[preset.ID] = preset.ModeTitle;
}
var alone = _playerManager.PlayerCount == 1 && initiator != null; var alone = _playerManager.PlayerCount == 1 && initiator != null;
var options = new VoteOptions var options = new VoteOptions
@@ -211,5 +197,25 @@ namespace Content.Server.Voting.Managers
_standardVoteTimeout[type] = _timing.RealTime + timeout; _standardVoteTimeout[type] = _timing.RealTime + timeout;
DirtyCanCallVoteAll(); DirtyCanCallVoteAll();
} }
private Dictionary<string, string> GetGamePresets()
{
var presets = new Dictionary<string, string>();
foreach (var preset in _prototypeManager.EnumeratePrototypes<GamePresetPrototype>())
{
if(!preset.ShowInVote)
continue;
if(_playerManager.PlayerCount < (preset.MinPlayers ?? int.MinValue))
continue;
if(_playerManager.PlayerCount > (preset.MaxPlayers ?? int.MaxValue))
continue;
presets[preset.ID] = preset.ModeTitle;
}
return presets;
}
} }
} }

10
Content.Server/Voting/Managers/VoteManager.cs
View File

@@ -6,6 +6,7 @@ using Content.Server.Administration;
using Content.Server.Administration.Managers; using Content.Server.Administration.Managers;
using Content.Server.Afk; using Content.Server.Afk;
using Content.Server.Chat.Managers; using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Maps; using Content.Server.Maps;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.CCVar; using Content.Shared.CCVar;
@@ -326,6 +327,15 @@ namespace Content.Server.Voting.Managers
if (voteType == StandardVoteType.Restart && _cfg.GetCVar(CCVars.VoteRestartNotAllowedWhenAdminOnline) && _adminMgr.ActiveAdmins.Count() != 0) if (voteType == StandardVoteType.Restart && _cfg.GetCVar(CCVars.VoteRestartNotAllowedWhenAdminOnline) && _adminMgr.ActiveAdmins.Count() != 0)
return false; return false;
// If only one Preset available thats not really a vote
// Still allow vote if availbable one is different from current one
if (voteType == StandardVoteType.Preset)
{
var presets = GetGamePresets();
if (presets.Count() == 1 && presets.Select(x => x.Key).Single() == EntitySystem.Get<GameTicker>().Preset?.ID)
return false;
}
return !_voteTimeout.TryGetValue(initiator.UserId, out timeSpan); return !_voteTimeout.TryGetValue(initiator.UserId, out timeSpan);
} }