Unstable 1.2.4.0

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs

@@ -260,6 +260,12 @@ namespace Barotrauma.Items.Components
             if (!hasSoundsOfType[(int)type]) { return; }
             if (GameMain.Client?.MidRoundSyncing ?? false) { return; }
 
+            //above the top boundary of the level (in an inactive respawn shuttle?)
+            if (item.Submarine != null && Level.Loaded != null && item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) 
+            {
+                return; 
+            }
+
             if (loopingSound != null)
             {
                 if (Vector3.DistanceSquared(GameMain.SoundManager.ListenerPosition, new Vector3(item.WorldPosition, 0.0f)) > loopingSound.Range * loopingSound.Range ||
@@ -388,12 +394,9 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void StopSounds(ActionType type)
+        public void StopLoopingSound()
         {
             if (loopingSound == null) { return; }
-
-            if (loopingSound.Type != type) { return; }
-
             if (loopingSoundChannel != null)
             {
                 loopingSoundChannel.FadeOutAndDispose();
@@ -402,6 +405,12 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public void StopSounds(ActionType type)
+        {
+            if (loopingSound == null || loopingSound.Type != type) { return; }
+            StopLoopingSound();
+        }
+
         private float GetSoundVolume(ItemSound sound)
         {
             if (sound == null) { return 0.0f; }
@@ -761,6 +770,8 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public virtual void OnPlayerSkillsChanged() { }
+
         public virtual void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description) { }
     }
 }