This commit is contained in:
Nick 2023-01-18 01:11:03 -05:00
parent c14c5bc5af
commit 204641414d

View File

@ -1,4 +1,6 @@
using HarmonyLib; using HarmonyLib;
using NewHorizons.Utility;
using System;
namespace NewHorizons.Patches namespace NewHorizons.Patches
{ {
@ -14,12 +16,15 @@ namespace NewHorizons.Patches
[HarmonyPatch(typeof(RemoteDialogueTrigger), nameof(RemoteDialogueTrigger.OnTriggerEnter))] [HarmonyPatch(typeof(RemoteDialogueTrigger), nameof(RemoteDialogueTrigger.OnTriggerEnter))]
public static void RemoteDialogueTrigger_OnTriggerEnter(RemoteDialogueTrigger __instance) public static void RemoteDialogueTrigger_OnTriggerEnter(RemoteDialogueTrigger __instance)
{ {
if (__instance._inRemoteDialogue && __instance._activeRemoteDialogue != null) if (__instance._inRemoteDialogue && __instance._activeRemoteDialogue?.gameObject != null)
{ {
_wasLastDialogueInactive = __instance._activeRemoteDialogue.gameObject.activeInHierarchy; _wasLastDialogueInactive = __instance._activeRemoteDialogue.gameObject.activeInHierarchy;
if (!_wasLastDialogueInactive)
{
__instance._activeRemoteDialogue.gameObject.SetActive(true); __instance._activeRemoteDialogue.gameObject.SetActive(true);
} }
} }
}
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(RemoteDialogueTrigger), nameof(RemoteDialogueTrigger.OnEndConversation))] [HarmonyPatch(typeof(RemoteDialogueTrigger), nameof(RemoteDialogueTrigger.OnEndConversation))]