From 502da518cb98ecfa029a1596efc2c1e6ab1c9eaa Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Thu, 12 Nov 2020 04:02:50 +0100 Subject: [PATCH] Improve PlayerSetStartCounterEvent readability --- .../Events/Game/Player/IPlayerSetStartCounterEvent.cs | 2 +- .../Events/Game/Player/PlayerSetStartCounterEvent.cs | 8 ++++---- .../Net/Inner/Objects/InnerPlayerControl.cs | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Impostor.Api/Events/Game/Player/IPlayerSetStartCounterEvent.cs b/src/Impostor.Api/Events/Game/Player/IPlayerSetStartCounterEvent.cs index d7fc562..c03d782 100644 --- a/src/Impostor.Api/Events/Game/Player/IPlayerSetStartCounterEvent.cs +++ b/src/Impostor.Api/Events/Game/Player/IPlayerSetStartCounterEvent.cs @@ -5,6 +5,6 @@ namespace Impostor.Api.Events.Player /// /// Gets the current time of the start counter. /// - byte Value { get; } + byte SecondsLeft { get; } } } diff --git a/src/Impostor.Server/Events/Game/Player/PlayerSetStartCounterEvent.cs b/src/Impostor.Server/Events/Game/Player/PlayerSetStartCounterEvent.cs index 821aa2d..71c25d7 100644 --- a/src/Impostor.Server/Events/Game/Player/PlayerSetStartCounterEvent.cs +++ b/src/Impostor.Server/Events/Game/Player/PlayerSetStartCounterEvent.cs @@ -3,19 +3,19 @@ using Impostor.Api.Games; using Impostor.Api.Net; using Impostor.Api.Net.Inner.Objects; -namespace Impostor.Server.Events.Game.Player +namespace Impostor.Server.Events.Player { public class PlayerSetStartCounterEvent : IPlayerSetStartCounterEvent { - public PlayerSetStartCounterEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl, byte value) + public PlayerSetStartCounterEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl, byte secondsLeft) { Game = game; ClientPlayer = clientPlayer; PlayerControl = playerControl; - Value = value; + SecondsLeft = secondsLeft; } - public byte Value { get; } + public byte SecondsLeft { get; } public IClientPlayer ClientPlayer { get; } diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs index df4f0b5..7762a7e 100644 --- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs @@ -6,7 +6,6 @@ using Impostor.Api.Events.Managers; using Impostor.Api.Innersloth; using Impostor.Api.Net; using Impostor.Api.Net.Messages; -using Impostor.Server.Events.Game.Player; using Impostor.Server.Events.Player; using Impostor.Server.Net.Inner.Objects.Components; using Impostor.Server.Net.State; @@ -398,7 +397,6 @@ namespace Impostor.Server.Net.Inner.Objects // Is either start countdown or byte.MaxValue var secondsLeft = reader.ReadByte(); - if (secondsLeft < byte.MaxValue) { await _eventManager.CallAsync(new PlayerSetStartCounterEvent(_game, sender, this, secondsLeft)); -- 2.39.5