Fixed cinematic not starting if skip was pressed shortly

SubnauticaNitrox · May 10, 2024 · 608b777 · 608b777
1 parent 8d4549c
commit 608b777
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/NitroxClient/MonoBehaviours/IntroCinematicUpdater.cs b/NitroxClient/MonoBehaviours/IntroCinematicUpdater.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using NitroxClient.GameLogic;
 using NitroxModel.Core;
@@ -19,11 +20,11 @@ public class IntroCinematicUpdater : MonoBehaviour
     private Transform[] seatPartsRight;
     private Transform seatArmRestLeft;
     private Transform seatArmRestRight;
-    private SkinnedMeshRenderer[] seatBarRendererRight;
+    private SkinnedMeshRenderer[] seatBarRendererRight = Array.Empty<SkinnedMeshRenderer>();
 
     private SkinnedMeshRenderer remotePlayerHeadRenderer;
     private GameObject remotePlayerCustomHead;
-    private SkinnedMeshRenderer[] remoteRenders;
+    private SkinnedMeshRenderer[] remoteRenders = Array.Empty<SkinnedMeshRenderer>();
 
     public void Awake()
     {

diff --git a/NitroxPatcher/Patches/Dynamic/uGUI_SceneIntro_IntroSequence_Patch.cs b/NitroxPatcher/Patches/Dynamic/uGUI_SceneIntro_IntroSequence_Patch.cs
@@ -93,6 +93,7 @@ private static float GetSkipTime()
     private static bool IsRemoteCinematicReady(uGUI_SceneIntro uGuiSceneIntro)
     {
         if (callbackRun) return true;
+
         if (GameModeUtils.currentGameMode.HasFlag(GameModeOption.Creative)) uGuiSceneIntro.Stop(true); // Stopping intro if Creative like in normal SN
 
         if (Resolve<LocalPlayer>().IntroCinematicMode == IntroCinematicMode.COMPLETED)
@@ -101,7 +102,14 @@ private static bool IsRemoteCinematicReady(uGUI_SceneIntro uGuiSceneIntro)
             EndRemoteCinematic();
         }
 
-        if (!uGuiSceneIntro.moveNext) return false;
+        // See NitroxServer.Communication.Packets.Processors.SetIntroCinematicModeProcessor
+        RemotePlayer firstWaitingRemotePlayer = Resolve<PlayerManager>().GetAll().FirstOrDefault(r => r.PlayerContext.IntroCinematicMode is IntroCinematicMode.START);
+        if (firstWaitingRemotePlayer != null)
+        {
+            partner = firstWaitingRemotePlayer;
+            EnqueueStartCinematic(uGuiSceneIntro);
+            Resolve<PlayerCinematics>().SetLocalIntroCinematicMode(IntroCinematicMode.PLAYING);
+        }
 
         if (!packetSend)
         {
@@ -112,16 +120,6 @@ private static bool IsRemoteCinematicReady(uGUI_SceneIntro uGuiSceneIntro)
             Resolve<PlayerCinematics>().SetLocalIntroCinematicMode(IntroCinematicMode.WAITING);
             packetSend = true;
             IsWaitingForPartner = true;
-            return false;
-        }
-
-        // See NitroxServer.Communication.Packets.Processors.SetIntroCinematicModeProcessor
-        RemotePlayer firstWaitingRemotePlayer = Resolve<PlayerManager>().GetAll().FirstOrDefault(r => r.PlayerContext.IntroCinematicMode is IntroCinematicMode.START);
-        if (firstWaitingRemotePlayer != null)
-        {
-            partner = firstWaitingRemotePlayer;
-            EnqueueStartCinematic(uGuiSceneIntro);
-            Resolve<PlayerCinematics>().SetLocalIntroCinematicMode(IntroCinematicMode.PLAYING);
         }
 
         return false;