diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index e1e60bc5d0..7faf616f55 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -80,7 +80,7 @@ namespace Content.Server.Voting.Managers foreach (var player in _playerManager.GetAllPlayers()) { - if (player != initiator) + if (player != initiator && !_afkManager.IsAfk(player)) { // Everybody else defaults to a no vote. vote.CastVote(player, 1); diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index c4aefb5c2d..0d1ff76f66 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -6,6 +6,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.Administration; using Content.Server.Administration.Managers; +using Content.Server.Afk; using Content.Server.Chat.Managers; using Content.Shared.Administration; using Content.Shared.Collections; @@ -32,6 +33,7 @@ namespace Content.Server.Voting.Managers [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IAdminManager _adminMgr = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IAfkManager _afkManager = default!; private int _nextVoteId = 1; diff --git a/Resources/Changelog/Parts/restart_vote_afk.yml b/Resources/Changelog/Parts/restart_vote_afk.yml new file mode 100644 index 0000000000..3cc40f81cc --- /dev/null +++ b/Resources/Changelog/Parts/restart_vote_afk.yml @@ -0,0 +1,4 @@ +author: PJB +changes: + - type: Tweak + message: AFK players no longer automatically vote "no" on restart votes.