diff --git a/src/Managers/NetworkManager.cs b/src/Managers/NetworkManager.cs index a3244f4..deb1d88 100644 --- a/src/Managers/NetworkManager.cs +++ b/src/Managers/NetworkManager.cs @@ -274,11 +274,11 @@ internal static class NetworkManager break; } - if (innerNetObject is PlayerControl player && player != null) + if (innerNetObject is PlayerPhysics playerPhysics) { if (rpcCall == (byte)RPC.CUSTOM_RPC_CALL) { - if (RPC.HandleCustomRPCPacked(player, reader)) + if (RPC.HandleCustomRPCPacked(playerPhysics.myPlayer, reader)) { break; } @@ -291,7 +291,7 @@ internal static class NetworkManager } else { - if (innerNetObject is PlayerControl player2 && player2 != null) + if (innerNetObject is PlayerControl player2) { RPC.HandleCustomRPCLegacy(player2, rpcCall, reader); } diff --git a/src/Network/RPC.cs b/src/Network/RPC.cs index 39d7cf6..8bcf5fe 100644 --- a/src/Network/RPC.cs +++ b/src/Network/RPC.cs @@ -26,7 +26,7 @@ internal static class RPC /// The specific client ID to target, or -1 to broadcast to all clients. internal static void SendCustomRpcPacked(CustomRPC customRPC, Action action, int targetClientId = -1) { - AmongUsClient.Instance.SendRpcImmediately(PlayerControl.LocalPlayer.NetId, CUSTOM_RPC_CALL, SendOption.Reliable, writer => + AmongUsClient.Instance.SendRpcImmediately(PlayerControl.LocalPlayer.MyPhysics.NetId, CUSTOM_RPC_CALL, SendOption.Reliable, writer => { writer.Write(ModInfo.Constants.BAU_CUSTOM_RPC_FLAG); // Flag to check if its a rpc packed into SetNamePlateStr writer.Write((byte)customRPC);