AmongUsMods/Reactor
1
0 Fork 0
mirror of https://github.com/NuclearPowered/Reactor.git synced 2026-10-19 15:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2021.11.9

Browse Source
This commit is contained in:
js6pak committed 2021-12-03 00:52:46 +01:00
2 parents 8e8beaf30c c96f12029e
commit bc9b8ea8a2
2 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Reactor/Networking/MethodRpc/MethodRpc.cs
+4 -2
View File
@@ -18,11 +18,12 @@ namespace Reactor.Networking.MethodRpc
{
public delegate object HandleDelegate(InnerNetObject innerNetObject, object[] args);
public MethodRpc(BasePlugin plugin, MethodInfo method, uint id, SendOption option, RpcLocalHandling localHandling) : base(plugin, id)
public MethodRpc(BasePlugin plugin, MethodInfo method, uint id, SendOption option, RpcLocalHandling localHandling, bool sendImmediately) : base(plugin, id)
{
Method = method;
LocalHandling = localHandling;
SendOption = option;
SendImmediately = sendImmediately;
if (!method.IsStatic)
{
@@ -56,6 +57,7 @@ namespace Reactor.Networking.MethodRpc
public override Type InnerNetObjectType { get; }
public override RpcLocalHandling LocalHandling { get; }
public override SendOption SendOption { get; }
public bool SendImmediately { get; }
public override void UnsafeWrite(MessageWriter writer, object? data)
{
@@ -82,7 +84,7 @@ namespace Reactor.Networking.MethodRpc
public void Send(InnerNetObject innerNetObject, object[] args)
{
UnsafeSend(innerNetObject, args);
UnsafeSend(innerNetObject, args, SendImmediately);
}
private static readonly MethodInfo _sendMethod = AccessTools.Method(typeof(MethodRpc), nameof(Send));
Reactor/Networking/MethodRpc/MethodRpcAttribute.cs
+2 -1
View File
@@ -13,6 +13,7 @@ namespace Reactor.Networking.MethodRpc
public uint Id { get; }
public SendOption Option { get; set; } = SendOption.Reliable;
public RpcLocalHandling LocalHandling { get; set; } = RpcLocalHandling.Before;
public bool SendImmediately { get; set; }
public MethodRpcAttribute(uint id)
{
@@ -34,7 +35,7 @@ namespace Reactor.Networking.MethodRpc
try
{
var customRpc = new MethodRpc(plugin, method, attribute.Id, attribute.Option, attribute.LocalHandling);
var customRpc = new MethodRpc(plugin, method, attribute.Id, attribute.Option, attribute.LocalHandling, attribute.SendImmediately);
PluginSingleton<ReactorPlugin>.Instance.CustomRpcManager.Register(customRpc);
}
catch (Exception e)