Handle destroying OnDisable

project-fika · Dec 2, 2024 · bd615a6 · bd615a6
1 parent 82b402c
commit bd615a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs b/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs
@@ -104,20 +104,15 @@ private void WebSocket_OnMessage(object sender, MessageEventArgs e)
 				case "fikaDedicatedJoinMatch":
 					string matchId = jsonObject.Value<string>("matchId");
 
-					GameObject matchmakerObject = MatchmakerAcceptScreen_Show_Patch.MatchmakerObject;
 					MatchMakerAcceptScreen matchMakerAcceptScreen = FikaBackendUtils.MatchMakerAcceptScreenInstance;
 
 					if (!string.IsNullOrEmpty(matchId))
 					{
 						TarkovApplication tarkovApplication = (TarkovApplication)Singleton<ClientApplication<ISession>>.Instance;
-
 						tarkovApplication.StartCoroutine(MatchMakerUIScript.JoinMatch(tarkovApplication.Session.Profile.Id, matchId, null, (bool success) =>
 						{
 							if (success)
 							{
-								// Hide matchmaker UI
-								matchmakerObject.SetActive(false);
-
 								// Matchmaker next screen (accept)
 								matchMakerAcceptScreen.method_19().HandleExceptions();
 							}
@@ -126,7 +121,6 @@ private void WebSocket_OnMessage(object sender, MessageEventArgs e)
 					else
 					{
 						PreloaderUI.Instance.ShowErrorScreen("Fika Dedicated Error", "Received fikaJoinMatch WS event but there was no matchId");
-						matchmakerObject.SetActive(true);
 					}
 
 					FikaPlugin.DedicatedRaidWebSocket.Close();

diff --git a/Fika.Core/UI/Custom/MatchMakerUIScript.cs b/Fika.Core/UI/Custom/MatchMakerUIScript.cs
@@ -66,6 +66,7 @@ protected void OnDisable()
 				StopCoroutine(serverQueryRoutine);
 				serverQueryRoutine = null;
 			}
+			DestroyThis();
 		}
 
 		protected void Start()
@@ -78,11 +79,6 @@ protected void Start()
 
 		protected void Update()
 		{
-			if (Input.GetKeyDown(KeyCode.Escape))
-			{
-				DestroyThis();
-			}
-
 			if (stopQuery)
 			{
 				if (serverQueryRoutine != null)
@@ -273,7 +269,6 @@ private void CreateMatchMakerUI()
 					FikaBackendUtils.HostExpectedNumberOfPlayers = int.Parse(fikaMatchMakerUi.PlayerAmountText.text);
 					await FikaBackendUtils.CreateMatch(FikaBackendUtils.Profile.ProfileId, FikaBackendUtils.PMCName, raidSettings);
 					acceptButton.OnClick.Invoke();
-					DestroyThis();
 				}
 				else
 				{
@@ -331,7 +326,6 @@ private void CreateMatchMakerUI()
 			UnityEngine.Events.UnityEvent newEvent = new();
 			newEvent.AddListener(() =>
 			{
-				DestroyThis();
 				backButton.OnClick.Invoke();
 			});
 			DefaultUIButton newButtonComponent = newBackButton.GetComponent<DefaultUIButton>();
@@ -360,11 +354,10 @@ private void ToggleLoading(bool enabled)
 					StopCoroutine(serverQueryRoutine);
 					serverQueryRoutine = null;
 				}
+				return;
 			}
-			else if (!enabled)
-			{
-				serverQueryRoutine = StartCoroutine(ServerQuery());
-			}
+
+			serverQueryRoutine = StartCoroutine(ServerQuery());
 		}
 
 		private void AutoRefresh()
@@ -554,7 +547,6 @@ private void RefreshUI()
 					{
 						if (success)
 						{
-							DestroyThis();
 							acceptButton.OnClick.Invoke();
 							return;
 						}

diff --git a/Fika.Core/UI/Patches/MatchmakerAcceptScreen/MatchmakerAcceptScreen_Show_Patch.cs b/Fika.Core/UI/Patches/MatchmakerAcceptScreen/MatchmakerAcceptScreen_Show_Patch.cs
@@ -6,7 +6,6 @@
 using SPT.Reflection.Patching;
 using System.Linq;
 using System.Reflection;
-using UnityEngine;
 
 namespace Fika.Core.UI.Patches.MatchmakerAcceptScreen
 {
@@ -18,22 +17,15 @@ protected override MethodBase GetTargetMethod()
 				.First(x => x.Name == "Show" && x.GetParameters()[0].Name == "session");
 		}
 
-		public static GameObject MatchmakerObject { get; set; }
-
 		[PatchPrefix]
-		private static void Prefix(ref RaidSettings raidSettings, DefaultUIButton ____acceptButton, DefaultUIButton ____backButton)
+		private static void Prefix(MatchMakerAcceptScreen __instance, ref RaidSettings raidSettings, DefaultUIButton ____acceptButton, DefaultUIButton ____backButton)
 		{
-			if (MatchmakerObject == null)
-			{
-				MatchmakerObject = new GameObject("MatchmakerObject");
-			}
-
 			if (raidSettings.Side == ESideType.Savage)
 			{
 				raidSettings.RaidMode = ERaidMode.Local;
 			}
 
-			MatchMakerUIScript newMatchMaker = MatchmakerObject.GetOrAddComponent<MatchMakerUIScript>();
+			MatchMakerUIScript newMatchMaker = __instance.gameObject.GetOrAddComponent<MatchMakerUIScript>();
 			newMatchMaker.raidSettings = raidSettings;
 			newMatchMaker.acceptButton = ____acceptButton;
 			newMatchMaker.backButton = ____backButton;