From 2c12623a6571d3a8ada99401edcad0708b8b93f4 Mon Sep 17 00:00:00 2001 From: miniduikboot Date: Wed, 29 Nov 2023 22:14:59 +0100 Subject: [PATCH] Get rid of Rpc02 SyncSettings This RPC is still sent by clients, but no longer used by clients. As the server can get the info it wants from LogicOptions instead, remove this RPC to prevent people from using it accidentally --- .../Events/Game/IGameOptionsChangedEvent.cs | 4 +--- .../Net/Messages/Rpcs/Rpc02SyncSettings.cs | 22 ------------------- .../Net/Inner/Objects/InnerPlayerControl.cs | 3 +-- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 src/Impostor.Api/Net/Messages/Rpcs/Rpc02SyncSettings.cs diff --git a/src/Impostor.Api/Events/Game/IGameOptionsChangedEvent.cs b/src/Impostor.Api/Events/Game/IGameOptionsChangedEvent.cs index 14d7b0c..007ace9 100644 --- a/src/Impostor.Api/Events/Game/IGameOptionsChangedEvent.cs +++ b/src/Impostor.Api/Events/Game/IGameOptionsChangedEvent.cs @@ -1,5 +1,4 @@ using Impostor.Api.Games; -using Impostor.Api.Net.Messages.Rpcs; namespace Impostor.Api.Events { @@ -18,8 +17,7 @@ namespace Impostor.Api.Events public enum ChangeReason { /// - /// The options were changed by the host using - /// . + /// The options were changed by the host using LogicOptions deserialization. /// /// /// This event does not change the message sent to other players, diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc02SyncSettings.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc02SyncSettings.cs deleted file mode 100644 index 3541e9d..0000000 --- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc02SyncSettings.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Impostor.Api.Innersloth.GameOptions; - -namespace Impostor.Api.Net.Messages.Rpcs -{ - public static class Rpc02SyncSettings - { - public static void Serialize(IMessageWriter writer, IGameOptions gameOptionsData) - { - GameOptionsFactory.Serialize(writer, gameOptionsData); - } - - public static void Deserialize(IMessageReader reader, out IGameOptions gameOptionsData) - { - gameOptionsData = GameOptionsFactory.Deserialize(reader); - } - - public static void DeserializeInto(IMessageReader reader, IGameOptions gameOptionsData) - { - GameOptionsFactory.DeserializeInto(reader, gameOptionsData); - } - } -} diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs index e562fa8..ff71299 100644 --- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs @@ -15,7 +15,6 @@ using Impostor.Api.Net.Inner; using Impostor.Api.Net.Inner.Objects; using Impostor.Api.Net.Messages.Rpcs; using Impostor.Api.Utils; -using Impostor.Server.Events; using Impostor.Server.Events.Player; using Impostor.Server.Net.Inner.Objects.Components; using Impostor.Server.Net.State; @@ -142,7 +141,7 @@ namespace Impostor.Server.Net.Inner.Objects return false; } - Rpc02SyncSettings.DeserializeInto(reader, Game.Options); + // Clients no longer handle this packet since 2022.12.8 but continue to send it break; } -- 2.39.5