From: miniduikboot Date: Sun, 3 Dec 2023 21:55:05 +0000 (+0100) Subject: more comments sent over discord pm's X-Git-Tag: v1.9.0~6^2~2 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=87fd177e3982a98bd1a19b824884ccbe648b7c88;p=rhonda%2Fimpostor.git more comments sent over discord pm's --- diff --git a/src/Impostor.Server/Net/Inner/Objects/GameManager/InnerGameManager.cs b/src/Impostor.Server/Net/Inner/Objects/GameManager/InnerGameManager.cs index 3cc9514..6281c16 100644 --- a/src/Impostor.Server/Net/Inner/Objects/GameManager/InnerGameManager.cs +++ b/src/Impostor.Server/Net/Inner/Objects/GameManager/InnerGameManager.cs @@ -66,7 +66,7 @@ internal abstract class InnerGameManager : InnerNetObject, IInnerGameManager throw new System.NotImplementedException(); } - public override ValueTask DeserializeAsync(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) + public override async ValueTask DeserializeAsync(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { while (reader.Position < reader.Length) { @@ -80,7 +80,7 @@ internal abstract class InnerGameManager : InnerNetObject, IInnerGameManager var component = this._logicComponents[tag]; - component.Deserialize(innerReader, initialState); + await component.DeserializeAsync(innerReader, initialState); if (innerReader.Position < innerReader.Length) { @@ -92,7 +92,5 @@ internal abstract class InnerGameManager : InnerNetObject, IInnerGameManager innerReader.Length); } } - - return ValueTask.CompletedTask; } } diff --git a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/GameLogicComponent.cs b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/GameLogicComponent.cs index cb1f5f4..3847b53 100644 --- a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/GameLogicComponent.cs +++ b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/GameLogicComponent.cs @@ -16,7 +16,7 @@ internal abstract class GameLogicComponent throw new NotImplementedException(); } - public virtual ValueTask Deserialize(IMessageReader reader, bool initialState) + public virtual ValueTask DeserializeAsync(IMessageReader reader, bool initialState) { return default; } diff --git a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/HideAndSeek/LogicGameFlowHnS.cs b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/HideAndSeek/LogicGameFlowHnS.cs index 31ca336..c26bf52 100644 --- a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/HideAndSeek/LogicGameFlowHnS.cs +++ b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/HideAndSeek/LogicGameFlowHnS.cs @@ -9,7 +9,7 @@ internal class LogicGameFlowHnS : LogicGameFlow, ILogicGameFlowHnS public float CurrentHideTime { get; private set; } - public override ValueTask Deserialize(IMessageReader reader, bool initialState) + public override ValueTask DeserializeAsync(IMessageReader reader, bool initialState) { var num = reader.ReadSingle(); diff --git a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/LogicOptions.cs b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/LogicOptions.cs index 626b1d9..f444582 100644 --- a/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/LogicOptions.cs +++ b/src/Impostor.Server/Net/Inner/Objects/GameManager/Logic/LogicOptions.cs @@ -23,12 +23,12 @@ internal abstract class LogicOptions : GameLogicComponent return true; } - public override async ValueTask Deserialize(IMessageReader reader, bool initialState) + public override async ValueTask DeserializeAsync(IMessageReader reader, bool initialState) { GameOptionsFactory.DeserializeInto(reader, _game.Options); await _eventManager.CallAsync(new GameOptionsChangedEvent( _game, - Api.Events.IGameOptionsChangedEvent.ChangeReason.Host) - ); + Api.Events.IGameOptionsChangedEvent.ChangeReason.Host + )); } } diff --git a/src/Impostor.Server/Net/State/Game.Api.cs b/src/Impostor.Server/Net/State/Game.Api.cs index bc5da05..e3fc4cb 100644 --- a/src/Impostor.Server/Net/State/Game.Api.cs +++ b/src/Impostor.Server/Net/State/Game.Api.cs @@ -76,8 +76,8 @@ namespace Impostor.Server.Net.State _alreadyCallingOptionsChangedEvent = true; await _eventManager.CallAsync(new GameOptionsChangedEvent( this, - Api.Events.IGameOptionsChangedEvent.ChangeReason.Api) - ); + Api.Events.IGameOptionsChangedEvent.ChangeReason.Api + )); } finally {