-Patched RPC Execution, allowing PML RPCs to run earlier.

-Changed Patch locations to send mod info and verify clients earlier.
PULSAR-Modders · Sep 4, 2022 · 4114f27 · 4114f27
1 parent 300311e
commit 4114f27
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 6 deletions.
diff --git a/PulsarModLoader/MPModChecks/MPModCheckManager.cs b/PulsarModLoader/MPModChecks/MPModCheckManager.cs
@@ -355,7 +355,7 @@ public bool ClientClickJoinRoom(RoomInfo room)
             }
         }
 
-        public void HostOnClientJoined(PhotonPlayer Player)
+        public bool HostOnClientJoined(PhotonPlayer Player)
         {
             MPModDataBlock[] ClientMods = null;
             bool foundplayer = false;
@@ -458,6 +458,7 @@ public void HostOnClientJoined(PhotonPlayer Player)
                     KickClient(Player);
 
                     Logger.Info("Kicked client for failing mod check with the following message:" + message);
+                    return false;
                 }
                 else
                 {
@@ -472,13 +473,14 @@ public void HostOnClientJoined(PhotonPlayer Player)
                     string message = $"You have been disconnected for not having the mod loader installed";
                     ModMessageHelper.Instance.photonView.RPC("RecieveErrorMessage", Player, new object[] { message });
                     KickClient(Player);
-                    return;
+                    return false;
                 }
                 Utilities.Logger.Info("Didn't receive message or proper modlist, but the server doesn't have multiplayer explicit mods. Proceeding onwards");
             }
+            return true;
         }
 
-        public IEnumerator ServerVerifyClient(PhotonPlayer player)
+        /*public IEnumerator ServerVerifyClient(PhotonPlayer player)
         {
             int loops = 0;
             WaitForSeconds cachedWaitTime = new WaitForSeconds(0.25f);
@@ -492,7 +494,7 @@ public IEnumerator ServerVerifyClient(PhotonPlayer player)
                 yield return cachedWaitTime;
             }
             HostOnClientJoined(player);
-        }
+        }*/
 
         [HarmonyPatch(typeof(PLUIPlayMenu), "ActuallyJoinRoom")] //allow/disallow local client to join server.
         class JoinRoomPatch
@@ -503,16 +505,24 @@ static bool Prefix(RoomInfo room)
             }
         }
 
-        [HarmonyPatch(typeof(PLServer), "ServerOnClientVerified")] //Starts host mod verification coroutine
+        /*[HarmonyPatch(typeof(PLServer), "ServerOnClientVerified")] //Starts host mod verification coroutine
         class ServerOnClientVerifiedPatch
         {
             static void Postfix(PhotonPlayer client)
             {
                 PLServer.Instance.StartCoroutine(Instance.ServerVerifyClient(client));
             }
+        }*/
+        [HarmonyPatch(typeof(PLServer), "AttemptGetVerified")]
+        class AttemptGetVerifiedRecievePatch
+        {
+            static bool Prefix(PhotonMessageInfo pmi)
+            {
+                return Instance.HostOnClientJoined(pmi.sender);
+            }
         }
 
-        [HarmonyPatch(typeof(PLServer), "VerifyClient")] //Client sends mod info as early as possible during connection
+        /*[HarmonyPatch(typeof(PLServer), "VerifyClient")] //Client sends mod info as early as possible during connection
         class ClientJoinPatch
         {
             static void Postfix(PhotonPlayer player, PhotonMessageInfo pmi)
@@ -530,6 +540,31 @@ static void Postfix(PhotonPlayer player, PhotonMessageInfo pmi)
                     player.Verified = true;
                 }
             }
+        }*/
+
+        [HarmonyPatch(typeof(PLServer), "Update")]
+        class AttemptGetVerifiedSendPatch
+        {
+            static void PatchMethod() //Client sends mod info just before requesting verification
+            {
+                Logger.Info("Sending 'RecieveConnectionMessage' RPC");
+                ModMessageHelper.Instance.photonView.RPC("ReceiveConnectionMessage", PhotonTargets.MasterClient, new object[]
+                {
+                    Instance.SerializeHashfullUserData()
+                });
+            }
+            static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+            {
+                List<CodeInstruction> targetSequence = new List<CodeInstruction>()
+                {
+                    new CodeInstruction(OpCodes.Ldstr, "Attempting to get verified")
+                };
+                List<CodeInstruction> injectedSequence = new List<CodeInstruction>()
+                {
+                    new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(AttemptGetVerifiedSendPatch), "PatchMethod"))
+                };
+                return HarmonyHelpers.PatchBySequence(instructions, targetSequence, injectedSequence);
+            }
         }
 
         [HarmonyPatch(typeof(PLServer), "RemovePlayer")]

diff --git a/PulsarModLoader/ModMessage/AllowPMLRPCPatch.cs b/PulsarModLoader/ModMessage/AllowPMLRPCPatch.cs
@@ -0,0 +1,38 @@
+using HarmonyLib;
+using PulsarModLoader.Patches;
+using System.Collections.Generic;
+using System.Reflection.Emit;
+
+namespace PulsarModLoader.ModMessages
+{
+    [HarmonyPatch(typeof(NetworkingPeer), "ExecuteRpc")]
+    class AllowPMLRPCPatch
+    {
+        static bool PatchMethod(bool ShouldContinue, string MethodName)
+        {
+            if (MethodName == "ReceiveConnectionMessage" || MethodName == "ReceiveMessage")
+            {
+                return true;
+            }
+            else
+            {
+                return ShouldContinue;
+            }
+        }
+        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            List<CodeInstruction> targetSequence = new List<CodeInstruction>()
+                {
+                    new CodeInstruction(OpCodes.Stloc_S, (byte)10),
+                    new CodeInstruction(OpCodes.Ldloc_S, (byte)10),
+                };
+
+            List<CodeInstruction> injectedSequence = new List<CodeInstruction>()
+                {
+                    new CodeInstruction(OpCodes.Ldloc_2),
+                    new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(AllowPMLRPCPatch), "PatchMethod")),
+                };
+            return HarmonyHelpers.PatchBySequence(instructions, targetSequence, injectedSequence, patchMode: HarmonyHelpers.PatchMode.AFTER);
+        }
+    }
+}
diff --git a/PulsarModLoader/PulsarModLoader.csproj b/PulsarModLoader/PulsarModLoader.csproj
@@ -189,6 +189,7 @@
     <Compile Include="CustomGUI\GUIMain.cs" />
     <Compile Include="CustomGUI\ModSettingsMenu.cs" />
     <Compile Include="CustomGUI\PMLSettings.cs" />
+    <Compile Include="ModMessage\AllowPMLRPCPatch.cs" />
     <Compile Include="ModMessage\ModMessage.cs" />
     <Compile Include="ModMessage\ModMessageHelper.cs" />
     <Compile Include="MPModChecks\MPModCheckManager.cs" />