v1.0.1

Author: checkraisefold

MidroundJoin.csproj

@@ -9,14 +9,15 @@
       https://nuget.bepinex.dev/v3/index.json
     </RestoreAdditionalProjectSources>
     <RootNamespace>MidroundJoin</RootNamespace>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all" />
+    <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2" PrivateAssets="all" />
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="2.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.1.0" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2021.2.7" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
@@ -33,7 +34,7 @@
     <Reference Include="Mirror">
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Gladio Mori Demo\Gladio Mori_Data\Managed\Mirror.dll</HintPath>
     </Reference>
-    <Reference Include="Mirror.Components">
+    <Reference Include="Mirror.Components" Publicize="true">
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Gladio Mori Demo\Gladio Mori_Data\Managed\Mirror.Components.dll</HintPath>
     </Reference>
   </ItemGroup>

src/Main.cs

@@ -2,12 +2,15 @@
 using BepInEx.Bootstrap;
 using BepInEx.Logging;
 using HarmonyLib;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace ModMidroundJoin {
-	[BepInPlugin("gay.crf.modiomori.midroundjoin", "MidRoundJoin", "1.0.0")]
+	[BepInPlugin("gay.crf.modiomori.midroundjoin", "MidRoundJoin", "1.0.1")]
 	public class MidroundJoinPlugin : BaseUnityPlugin {
-		public static ManualLogSource? Log;
+		internal static ManualLogSource? Log;
+		internal static Dictionary<uint, bool> DeleteCharacterOnce = new Dictionary<uint, bool>();
+
 		private void Awake() {
 			Log = Logger;
 			Chainloader.ManagerObject.hideFlags = HideFlags.HideAndDontSave;

src/Patches.cs

@@ -1,7 +1,6 @@
 using HarmonyLib;
 using System.Collections.Generic;
 using System.Linq;
-using System;
 using Mirror;
 using UnityEngine.SceneManagement;
 using UnityEngine;
@@ -39,17 +38,18 @@ private static IEnumerable<CodeInstruction> AddPlayerHook(
 
 		[HarmonyPostfix,
 		 HarmonyPatch(typeof(NetworkServer), "AddPlayerForConnection",
-		              new Type[] { typeof(NetworkConnectionToClient), typeof(GameObject) })]
+		              new System.Type[] { typeof(NetworkConnectionToClient), typeof(GameObject) })]
 		private static void PendingPlayerHook(NetworkConnectionToClient conn, GameObject player) {
-			if (SceneManager.GetActiveScene().name != "LobbyMultiplayer") {
-				NetworkRoomManager.PendingPlayer PendingPlayer;
-				PendingPlayer.conn = conn;
-				PendingPlayer.roomPlayer = player;
+			if (SceneManager.GetActiveScene().name == "LobbyMultiplayer")
+				return;
 
-				MultiplayerRoomManager RoomManager =
-				    (MultiplayerRoomManager)NetworkRoomManager.singleton;
-				RoomManager.pendingPlayers.Add(PendingPlayer);
-			}
+			NetworkRoomManager RoomManager = (NetworkRoomManager)NetworkRoomManager.singleton;
+			MultiplayerRoomPlayer RoomPlayer = player.GetComponent<MultiplayerRoomPlayer>();
+			if (RoomPlayer == null)
+				return;
+
+			MidroundJoinPlugin.DeleteCharacterOnce[RoomPlayer.netId] = true;
+			RoomManager.SceneLoadedForPlayer(conn, player);
 		}
 
 		[HarmonyPrefix,
@@ -60,18 +60,37 @@ private static void FixMovesetEquipmentHook(NetworkConnectionToClient conn,
 			    roomPlayer.GetComponent<MultiplayerRoomPlayer>();
 			if (RoomPlayerComponent.selectedMoveSet != null &&
 			    (RoomPlayerComponent.selectedEquipment != null &&
-			     RoomPlayerComponent.selectedEquipment.Count > 0)) {
+			     RoomPlayerComponent.selectedEquipment.Count > 0))
 				return;
-			}
 
 			foreach (MoveSet Set in MoveSetHelpers.MoveSets) {
-				MidroundJoinPlugin.Log!.LogInfo(Set.name);
 				if (Set.name.Contains("Bardiche")) {
 					RoomPlayerComponent.selectedMoveSet = Set;
 					RoomPlayerComponent.selectedEquipment = Set.defaultEquipment;
 					break;
 				}
 			}
 		}
+
+		[HarmonyPostfix, HarmonyPatch(typeof(PlayerMultiplayerInputManager), "Start")]
+		private static void FixBrokenCharacterOnMidroundJoin(
+		    PlayerMultiplayerInputManager __instance, GameObject ___playerCharacter) {
+			if (__instance.multiplayerRoomPlayer == null)
+				return;
+
+			NetworkManager NetMan = NetworkManager.singleton;
+			if (NetMan != null && (NetMan.mode != NetworkManagerMode.Host &&
+			                       NetMan.mode != NetworkManagerMode.ServerOnly))
+				return;
+
+			if (!MidroundJoinPlugin.DeleteCharacterOnce.ContainsKey(
+			        __instance.multiplayerRoomPlayer.netId))
+				return;
+
+			MidroundJoinPlugin.DeleteCharacterOnce.Remove(__instance.multiplayerRoomPlayer.netId);
+			__instance.HandlePlayerDeath();
+			Object.Destroy(___playerCharacter.transform.Find("PlayerModelPhysics").gameObject);
+			Object.Destroy(___playerCharacter.transform.Find("PlayerModelAnimation").gameObject);
+		}
 	}
 }