Applying suggestions from Jannify's review

Co-authored-by: Jannify <23176718+Jannify@users.noreply.github.com>

NitroxClient/Communication/Packets/Processors/FootstepPacketProcessor.cs

@@ -13,8 +13,8 @@ public class FootstepPacketProcessor : ClientPacketProcessor<FootstepPacket>
     private readonly PlayerManager remotePlayerManager;
     private readonly FootstepSounds localFootstepSounds;
     private PARAMETER_ID fmodIndexSpeed = FMODUWE.invalidParameterId;
-    private readonly float footstepAudioRadius = 20f;
-    private readonly float footstepAudioMaxVolume = 0.5f;
+    private const float footstepAudioRadius = 20f;
+    private const float footstepAudioMaxVolume = 0.5f;
 
     public FootstepPacketProcessor(PlayerManager remotePlayerManager)
     {
@@ -24,42 +24,29 @@ public FootstepPacketProcessor(PlayerManager remotePlayerManager)
 
     public override void Process(FootstepPacket packet)
     {
-        var player = remotePlayerManager.Find(packet.playerID);
-        if (!player.HasValue)
+        var player = remotePlayerManager.Find(packet.PlayerID);
+        if (player.HasValue)
         {
-            return;
-        }
-        else
-        {
-            FMODAsset asset;
-            switch (packet.assetIndex)
+            FMODAsset asset = packet.AssetIndex switch
             {
-                case FootstepPacket.StepSounds.PRECURSOR_STEP_SOUND:
-                    asset = localFootstepSounds.precursorInteriorSound;
-                    break;
-                case FootstepPacket.StepSounds.METAL_STEP_SOUND:
-                    asset = localFootstepSounds.metalSound;
-                    break;
-                case FootstepPacket.StepSounds.LAND_STEP_SOUND:
-                    asset = localFootstepSounds.landSound;
-                    break;
-                default:
-                    asset = null;
-                    break;
-            }
-            EventInstance @event = FMODUWE.GetEvent(asset);
-            if (@event.isValid())
+                FootstepPacket.StepSounds.PRECURSOR_STEP_SOUND => localFootstepSounds.precursorInteriorSound,
+                FootstepPacket.StepSounds.METAL_STEP_SOUND => localFootstepSounds.metalSound,
+                FootstepPacket.StepSounds.LAND_STEP_SOUND => localFootstepSounds.landSound,
+                _ => null
+            };
+            EventInstance evt = FMODUWE.GetEvent(asset);
+            if (evt.isValid())
             {
                 if (FMODUWE.IsInvalidParameterId(fmodIndexSpeed))
                 {
-                    fmodIndexSpeed = FMODUWE.GetEventInstanceParameterIndex(@event, "speed");
+                    fmodIndexSpeed = FMODUWE.GetEventInstanceParameterIndex(evt, "speed");
                 }
                 ATTRIBUTES_3D attributes = player.Value.Body.To3DAttributes();
-                @event.set3DAttributes(attributes);
-                @event.setParameterValueByIndex(fmodIndexSpeed, player.Value.AnimationController.Velocity.magnitude);
-                @event.setVolume(FMODSystem.CalculateVolume(Player.mainObject.transform.position, player.Value.Body.transform.position, footstepAudioRadius, footstepAudioMaxVolume));
-                @event.start();
-                @event.release();
+                evt.set3DAttributes(attributes);
+                evt.setParameterValueByIndex(fmodIndexSpeed, player.Value.AnimationController.Velocity.magnitude);
+                evt.setVolume(FMODSystem.CalculateVolume(Player.mainObject.transform.position, player.Value.Body.transform.position, footstepAudioRadius, footstepAudioMaxVolume));
+                evt.start();
+                evt.release();
             }
         }
     }

NitroxModel/Packets/FootstepPacket.cs

@@ -1,24 +1,22 @@
 using System;
 
-namespace NitroxModel.Packets
+namespace NitroxModel.Packets;
+[Serializable]
+public class FootstepPacket : Packet
 {
-    [Serializable]
-    public class FootstepPacket : Packet
-    {
-        public ushort playerID { get; }
-        public StepSounds assetIndex { get; }
+    public ushort PlayerID { get; }
+    public StepSounds AssetIndex { get; }
 
-        public FootstepPacket(ushort playerID, StepSounds assetIndex)
-        {
-            this.playerID = playerID;
-            this.assetIndex = assetIndex;
-        }
+    public FootstepPacket(ushort playerID, StepSounds assetIndex)
+    {
+        this.PlayerID = playerID;
+        this.AssetIndex = assetIndex;
+    }
 
-        public enum StepSounds : byte
-        {
-            PRECURSOR_STEP_SOUND,
-            METAL_STEP_SOUND,
-            LAND_STEP_SOUND
-        }
+    public enum StepSounds : byte
+    {
+        PRECURSOR_STEP_SOUND,
+        METAL_STEP_SOUND,
+        LAND_STEP_SOUND
     }
 }

NitroxPatcher/Patches/Dynamic/FootstepSounds_OnStep_Patch.cs

@@ -80,26 +80,24 @@ private static float CalculateVolume(float originalVolume, FootstepSounds instan
         return soundData.Radius;
     });
 
-    public static void SendFootstepPacket(FMODAsset asset)
+    private static void SendFootstepPacket(FMODAsset asset)
     {
-        // Send footstep packet with the asset
-        var localPlayer = Resolve<LocalPlayer>();
-        if (localPlayer.PlayerId.HasValue)
+        if (Resolve<LocalPlayer>().PlayerId.HasValue)
         {
             FootstepPacket.StepSounds assetIndex;
-            if (asset.path == PRECURSOR_STEP_SOUND_PATH)
+            switch (asset.path)
             {
-                assetIndex = FootstepPacket.StepSounds.PRECURSOR_STEP_SOUND;
+                case PRECURSOR_STEP_SOUND_PATH:
+                    assetIndex = FootstepPacket.StepSounds.PRECURSOR_STEP_SOUND;
+                    break;
+                case METAL_STEP_SOUND_PATH:
+                    assetIndex = FootstepPacket.StepSounds.METAL_STEP_SOUND;
+                    break;
+                default:
+                    assetIndex = FootstepPacket.StepSounds.LAND_STEP_SOUND;
+                    break;
             }
-            else if (asset.path == METAL_STEP_SOUND_PATH)
-            {
-                assetIndex = FootstepPacket.StepSounds.METAL_STEP_SOUND;
-            }
-            else
-            {
-                assetIndex = FootstepPacket.StepSounds.LAND_STEP_SOUND;
-            }
-            var footstepPacket = new FootstepPacket(localPlayer.PlayerId.Value, assetIndex);
+            FootstepPacket footstepPacket = new(Resolve<LocalPlayer>().PlayerId.Value, assetIndex);
             Resolve<IPacketSender>().Send(footstepPacket);
         }
     }

NitroxServer/Communication/Packets/Processors/FootstepPacketProcessor.cs

@@ -3,48 +3,32 @@
 using NitroxServer.Communication.Packets.Processors.Abstract;
 using NitroxServer.GameLogic;
 
-namespace NitroxServer.Communication.Packets.Processors
+namespace NitroxServer.Communication.Packets.Processors;
+public class FootstepPacketProcessor : AuthenticatedPacketProcessor<FootstepPacket>
 {
-    public class FootstepPacketProcessor : AuthenticatedPacketProcessor<FootstepPacket>
-    {
-        private readonly float footstepAudioRange = 20f;
-        private readonly PlayerManager playerManager;
+    private readonly float footstepAudioRange = 20f;
+    private readonly PlayerManager playerManager;
 
-        public FootstepPacketProcessor(PlayerManager playerManager)
-        {
-            this.playerManager = playerManager;
-        }
+    public FootstepPacketProcessor(PlayerManager playerManager)
+    {
+        this.playerManager = playerManager;
+    }
 
-        public override void Process(FootstepPacket footstepPacket, Player sendingPlayer)
+    public override void Process(FootstepPacket footstepPacket, Player sendingPlayer)
+    {
+        foreach (Player player in playerManager.GetAllPlayers())
         {
-            var players = playerManager.GetAllPlayers();
-            foreach (Player player in players)
+            if (NitroxVector3.Distance(player.Position, sendingPlayer.Position) <= footstepAudioRange && player != sendingPlayer)
             {
-                if (sendingPlayer.SubRootId.HasValue)
+                // Forward footstep packet to players if they are within range to hear it and are in the same structure / submarine
+                if (sendingPlayer.SubRootId.HasValue && player.SubRootId.HasValue &&
+                    sendingPlayer.SubRootId.Value == player.SubRootId.Value)
                 {
-                    if (player.SubRootId.HasValue)
-                    {
-                        // If both players have id's, check if they are the same
-                        if (NitroxVector3.Distance(player.Position, sendingPlayer.Position) <= footstepAudioRange && player != sendingPlayer && player.SubRootId.Value == sendingPlayer.SubRootId.Value)
-                        {
-                            // Forward footstep packet to players if they are within range to hear it and are in the same structure / submarine
-                            player.SendPacket(footstepPacket);
-                        }
-                    }
-                    // If one player has an id and the other doesn't, automatically false
+                    player.SendPacket(footstepPacket);
                 }
-                else
+                else if (!sendingPlayer.SubRootId.HasValue && !player.SubRootId.HasValue)
                 {
-                    // if both player's don't have SubRootIds
-                    if (!player.SubRootId.HasValue)
-                    {
-                        if (NitroxVector3.Distance(player.Position, sendingPlayer.Position) <= footstepAudioRange && player != sendingPlayer)
-                        {
-                            // Forward footstep packet to players if they are within range to hear it and are in the same structure / submarine
-                            player.SendPacket(footstepPacket);
-                        }
-                    }
-                    // If one player doesn't have an id and other does, automatically false
+                    player.SendPacket(footstepPacket);
                 }
             }
         }