diff --git a/EpicOnlineTransport/EOSSDKComponent.cs b/EpicOnlineTransport/EOSSDKComponent.cs index 29c64e56..c4376f8a 100644 --- a/EpicOnlineTransport/EOSSDKComponent.cs +++ b/EpicOnlineTransport/EOSSDKComponent.cs @@ -22,12 +22,14 @@ namespace EpicTransport [Header("User Login")] public bool authInterfaceLogin = false; + public Epic.OnlineServices.Auth.LoginCredentialType authInterfaceCredentialType = Epic.OnlineServices.Auth.LoginCredentialType.AccountPortal; public uint devAuthToolPort = 7878; public string devAuthToolCredentialName = ""; public ExternalCredentialType connectInterfaceCredentialType = ExternalCredentialType.DeviceidAccessToken; public string deviceModel = "PC Windows 64bit"; [SerializeField] private string displayName = "User"; + public static string DisplayName { get => Instance.displayName; @@ -39,6 +41,7 @@ namespace EpicTransport [SerializeField] public bool collectPlayerMetrics = true; + public static bool CollectPlayerMetrics => Instance.collectPlayerMetrics; public bool checkForEpicLauncherAndRestart = false; @@ -97,6 +100,7 @@ namespace EpicTransport public static bool IsConnecting => Instance.isConnecting; protected static EOSSDKComponent instance; + protected static EOSSDKComponent Instance { get diff --git a/MirrorWeaver/QSBReaderWriterProcessor.cs b/MirrorWeaver/QSBReaderWriterProcessor.cs index 86592253..482368fc 100644 --- a/MirrorWeaver/QSBReaderWriterProcessor.cs +++ b/MirrorWeaver/QSBReaderWriterProcessor.cs @@ -39,6 +39,7 @@ namespace MirrorWeaver { continue; } + foreach (var instruction in method.Body.Instructions) { if (instruction.Operand is not GenericInstanceMethod calledMethod) @@ -47,7 +48,7 @@ namespace MirrorWeaver } if (calledMethod.DeclaringType.FullName == NetworkWriter_Write.DeclaringType.FullName && - calledMethod.Name == NetworkWriter_Write.Name) + calledMethod.Name == NetworkWriter_Write.Name) { var argType = calledMethod.GenericArguments[0]; @@ -60,7 +61,7 @@ namespace MirrorWeaver count++; } else if (calledMethod.DeclaringType.FullName == NetworkReader_Read.DeclaringType.FullName && - calledMethod.Name == NetworkReader_Read.Name) + calledMethod.Name == NetworkReader_Read.Name) { var argType = calledMethod.GenericArguments[0];