From: miniduikboot Date: Wed, 23 Jun 2021 18:46:45 +0000 (+0200) Subject: Turn derived properties into getters X-Git-Tag: v1.5.0~7^2 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=d2720442e9a256dedecae6995a279f72649320b6;p=rhonda%2Fimpostor.git Turn derived properties into getters There is no significant performance difference: while accessing the getters is slightly slower, this can be balanced against the cost of setting the property. As this is also cleaner, switch to getters. --- diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs index 9e0004a..fcd320f 100644 --- a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.PlayerVoteArea.cs @@ -16,16 +16,16 @@ namespace Impostor.Server.Net.Inner.Objects Parent = parent; TargetPlayer = targetPlayer; - IsDead = isDead; + VotedForId = (byte)(isDead ? TVoteType.Dead : TVoteType.HasNotVoted); } public InnerMeetingHud Parent { get; } public InnerPlayerInfo TargetPlayer { get; } - public bool IsDead { get; private set; } + public bool IsDead => VoteType == TVoteType.Dead; - public bool DidVote { get; private set; } + public bool DidVote => VoteType != TVoteType.HasNotVoted; public bool DidReport { get; private set; } @@ -40,7 +40,6 @@ namespace Impostor.Server.Net.Inner.Objects switch ((VoteType)value) { case TVoteType.Dead: - IsDead = true; VoteType = TVoteType.Dead; break; @@ -55,8 +54,6 @@ namespace Impostor.Server.Net.Inner.Objects VotedFor = Parent.Game.GameNet.GameData!.GetPlayerById(value)?.Controller; break; } - - DidVote = VoteType != TVoteType.HasNotVoted; } }