From: AeonLucid Date: Fri, 23 Oct 2020 22:07:34 +0000 (+0200) Subject: Add target to Deserialize of InnerNetObject X-Git-Tag: v1.2.2~96^2~34 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=923d9b776628dde87648fa338c9345a6e3fb61b0;p=rhonda%2Fimpostor.git Add target to Deserialize of InnerNetObject --- diff --git a/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs b/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs index d9912a8..b800cc6 100644 --- a/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs +++ b/src/Impostor.Api/Innersloth/Net/InnerNetObject.cs @@ -15,6 +15,6 @@ namespace Impostor.Api.Innersloth.Net public abstract bool Serialize(IMessageWriter writer, bool initialState); - public abstract void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState); + public abstract void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState); } } \ No newline at end of file diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs index 40fc96f..15f0437 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerCustomNetworkTransform.cs @@ -75,7 +75,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components return true; } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { var sequenceId = reader.ReadUInt16(); diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs index a0bff8d..3263186 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerPlayerPhysics.cs @@ -48,7 +48,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { throw new NotImplementedException(); } diff --git a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs index 1e43cd5..b77e563 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/Components/InnerVoteBanSystem.cs @@ -46,7 +46,7 @@ namespace Impostor.Api.Innersloth.Net.Objects.Components throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { var votes = _votes; var unknown = reader.ReadByte(); diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs b/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs index 2a4a3a8..cf5d307 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/InnerGameData.cs @@ -112,7 +112,7 @@ namespace Impostor.Api.Innersloth.Net.Objects throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { if (initialState) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs b/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs index 78bebd4..b76a883 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/InnerLobbyBehaviour.cs @@ -25,7 +25,7 @@ namespace Impostor.Api.Innersloth.Net.Objects throw new System.NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { throw new System.NotImplementedException(); } diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs b/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs index d742dc1..f00c6ef 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/InnerMeetingHud.cs @@ -113,7 +113,7 @@ namespace Impostor.Api.Innersloth.Net.Objects throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { if (initialState) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs b/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs index f84de76..bfc8fe1 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/InnerPlayerControl.cs @@ -376,7 +376,7 @@ namespace Impostor.Api.Innersloth.Net.Objects throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { if (initialState) { diff --git a/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs b/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs index 3bbf9b1..806837f 100644 --- a/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs +++ b/src/Impostor.Api/Innersloth/Net/Objects/InnerShipStatus.cs @@ -97,7 +97,7 @@ namespace Impostor.Api.Innersloth.Net.Objects throw new NotImplementedException(); } - public override void Deserialize(IClientPlayer sender, IMessageReader reader, bool initialState) + public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IMessageReader reader, bool initialState) { if (initialState) { diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs index ce1e37d..d9f3396 100644 --- a/src/Impostor.Server/Net/State/Game.Data.cs +++ b/src/Impostor.Server/Net/State/Game.Data.cs @@ -215,7 +215,7 @@ namespace Impostor.Server.Net.State var netId = reader.ReadPackedUInt32(); if (_allObjectsFast.TryGetValue(netId, out var obj)) { - obj.Deserialize(sender, reader, false); + obj.Deserialize(sender, target, reader, false); } else { @@ -300,7 +300,7 @@ namespace Impostor.Server.Net.State var readerSub = reader.ReadMessage(); if (readerSub.Length > 0) { - obj.Deserialize(sender, readerSub, true); + obj.Deserialize(sender, target, readerSub, true); } OnSpawn(obj);