From 87c7e3922a33706266f7f7569c267031337e144f Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Fri, 10 Nov 2023 12:33:26 +0100
Subject: [PATCH] Fix InnerNetObject writing in rpcs

---
 src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs  | 2 +-
 src/Impostor.Api/Net/Messages/Rpcs/Rpc45ProtectPlayer.cs | 2 +-
 src/Impostor.Api/Net/Messages/Rpcs/Rpc46Shapeshift.cs    | 2 +-
 src/Impostor.Api/Net/Messages/Rpcs/Rpc47CheckMurder.cs   | 2 +-
 src/Impostor.Api/Net/Messages/Rpcs/Rpc48CheckProtect.cs  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
index 0a0691d..5a4ef62 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
@@ -9,7 +9,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
         public static void Serialize(IMessageWriter writer, SystemTypes systemType, IInnerPlayerControl playerControl, ushort sequenceId, byte state, byte ventId)
         {
             writer.Write((byte)systemType);
-            writer.Write(playerControl.NetId);
+            writer.Write(playerControl);
             writer.Write(sequenceId);
             writer.Write(state);
             writer.Write(ventId);
diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc45ProtectPlayer.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc45ProtectPlayer.cs
index 23841da..7116aa5 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc45ProtectPlayer.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc45ProtectPlayer.cs
@@ -8,7 +8,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
     {
         public static void Serialize(IMessageWriter writer, IInnerPlayerControl playerControl, ColorType color)
         {
-            writer.WritePacked(playerControl.NetId);
+            writer.Write(playerControl);
             writer.Write((byte)color);
         }
 
diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc46Shapeshift.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc46Shapeshift.cs
index 0d4d0f9..5fb307d 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc46Shapeshift.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc46Shapeshift.cs
@@ -7,7 +7,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
     {
         public static void Serialize(IMessageWriter writer, IInnerPlayerControl playerControl, bool shouldAnimate)
         {
-            writer.Write(playerControl.NetId);
+            writer.Write(playerControl);
             writer.Write(shouldAnimate);
         }
 
diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc47CheckMurder.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc47CheckMurder.cs
index 229e369..51df123 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc47CheckMurder.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc47CheckMurder.cs
@@ -7,7 +7,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
     {
         public static void Serialize(IMessageWriter writer, IInnerPlayerControl playerControl)
         {
-            writer.Write(playerControl.NetId);
+            writer.Write(playerControl);
         }
 
         public static void Deserialize(IMessageReader reader, IGame game, out IInnerPlayerControl? playerControl)
diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc48CheckProtect.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc48CheckProtect.cs
index 5b5408f..00f5a94 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc48CheckProtect.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc48CheckProtect.cs
@@ -7,7 +7,7 @@ namespace Impostor.Api.Net.Messages.Rpcs
     {
         public static void Serialize(IMessageWriter writer, IInnerPlayerControl playerControl)
         {
-            writer.Write(playerControl.NetId);
+            writer.Write(playerControl);
         }
 
         public static void Deserialize(IMessageReader reader, IGame game, out IInnerPlayerControl? playerControl)
-- 
2.39.5