Fix rebase errors from changing PlayerId to nullable

SubnauticaNitrox · Nov 14, 2024 · afc771c · afc771c
1 parent a254112
commit afc771c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/Nitrox.Test/Patcher/Patches/PatchesTranspilerTest.cs b/Nitrox.Test/Patcher/Patches/PatchesTranspilerTest.cs
@@ -59,7 +59,7 @@ public class PatchesTranspilerTest
         [typeof(uGUI_PDA_Initialize_Patch), 2],
         [typeof(uGUI_PDA_SetTabs_Patch), 3],
         [typeof(uGUI_Pings_IsVisibleNow_Patch), 0],
-        [typeof(uGUI_SceneIntro_IntroSequence_Patch), 5],
+        [typeof(uGUI_SceneIntro_IntroSequence_Patch), 8],
         [typeof(uSkyManager_SetVaryingMaterialProperties_Patch), 0],
         [typeof(Welder_Weld_Patch), 1],
     ];

diff --git a/NitroxClient/Communication/Packets/Processors/SetIntroCinematicModeProcessor.cs b/NitroxClient/Communication/Packets/Processors/SetIntroCinematicModeProcessor.cs
@@ -20,12 +20,6 @@ public SetIntroCinematicModeProcessor(PlayerManager playerManager, PlayerCinemat
 
     public override void Process(SetIntroCinematicMode packet)
     {
-        if (!packet.PlayerId.HasValue)
-        {
-            Log.Error("playerId of SetIntroCinematicMode packet is null which is not expected.");
-            return;
-        }
-
         if (localPlayer.PlayerId == packet.PlayerId)
         {
             if (packet.PartnerId.HasValue)
@@ -37,7 +31,7 @@ public override void Process(SetIntroCinematicMode packet)
             return;
         }
 
-        if (playerManager.TryFind(packet.PlayerId.Value, out RemotePlayer remotePlayer))
+        if (playerManager.TryFind(packet.PlayerId, out RemotePlayer remotePlayer))
         {
             remotePlayer.PlayerContext.IntroCinematicMode = packet.Mode;
             return;

diff --git a/NitroxClient/GameLogic/PlayerLogic/PlayerCinematics.cs b/NitroxClient/GameLogic/PlayerLogic/PlayerCinematics.cs
@@ -51,7 +51,7 @@ public void SetLocalIntroCinematicMode(IntroCinematicMode introCinematicMode)
         if (localPlayer.IntroCinematicMode != introCinematicMode)
         {
             localPlayer.IntroCinematicMode = introCinematicMode;
-            packetSender.Send(new SetIntroCinematicMode(localPlayer.PlayerId!.Value, introCinematicMode));
+            packetSender.Send(new SetIntroCinematicMode(localPlayer.PlayerId.Value, introCinematicMode));
         }
     }
 }
diff --git a/NitroxModel/Packets/SetIntroCinematicMode.cs b/NitroxModel/Packets/SetIntroCinematicMode.cs
@@ -6,18 +6,18 @@ namespace NitroxModel.Packets;
 [Serializable]
 public class SetIntroCinematicMode : Packet
 {
-    public ushort? PlayerId { get; }
+    public ushort PlayerId { get; }
     public IntroCinematicMode Mode { get; }
     public ushort? PartnerId { get; set; }
 
-    public SetIntroCinematicMode(ushort? playerId, IntroCinematicMode mode)
+    public SetIntroCinematicMode(ushort playerId, IntroCinematicMode mode)
     {
         PlayerId = playerId;
         Mode = mode;
         PartnerId = null;
     }
 
-    public SetIntroCinematicMode(ushort? playerId, IntroCinematicMode mode, ushort? partnerId)
+    public SetIntroCinematicMode(ushort playerId, IntroCinematicMode mode, ushort? partnerId)
     {
         PlayerId = playerId;
         Mode = mode;

diff --git a/NitroxServer/Communication/Packets/Processors/SetIntroCinematicModeProcessor.cs b/NitroxServer/Communication/Packets/Processors/SetIntroCinematicModeProcessor.cs
@@ -17,12 +17,6 @@ public SetIntroCinematicModeProcessor(PlayerManager playerManager)
 
     public override void Process(SetIntroCinematicMode packet, Player player)
     {
-        if (!packet.PlayerId.HasValue)
-        {
-            Log.Warn($"Received {nameof(SetIntroCinematicMode)} packet where packet.{nameof(SetIntroCinematicMode.PlayerId)} was null");
-            return;
-        }
-
         if (packet.PlayerId != player.Id)
         {
             Log.Warn($"Received {nameof(SetIntroCinematicMode)} packet where packet.{nameof(SetIntroCinematicMode.PlayerId)} was not equal to sending playerId");