Unstable 0.15.13.0

Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs

@@ -332,7 +332,7 @@ namespace Barotrauma
                 {
                     cam.OffsetAmount = targetOffsetAmount = 0.0f;
                     cursorPosition =
-                        SelectedConstruction.Position +
+                        Position +
                         PlayerInput.MouseSpeed.ClampLength(10.0f); //apply a little bit of movement to the cursor pos to prevent AFK kicking
                 }
                 else if (!GameMain.Config.EnableMouseLook)
@@ -1096,6 +1096,7 @@ namespace Barotrauma
         private SoundChannel soundChannel;
         public void PlaySound(CharacterSound.SoundType soundType, float soundIntervalFactor = 1.0f, float maxInterval = 0)
         {
+            if (Removed) { return; }
             if (sounds == null || sounds.Count == 0) { return; }
             if (soundChannel != null && soundChannel.IsPlaying) { return; }
             if (GameMain.SoundManager?.Disabled ?? true) { return; }

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterNetworking.cs

@@ -452,11 +452,17 @@ namespace Barotrauma
                                 ushort itemID = msg.ReadUInt16();
                                 if (!(Entity.FindEntityByID(itemID) is Item item)) { continue; }
                                 item.AllowStealing = true;
-                                var wifiComponent = item.GetComponent<Items.Components.WifiComponent>();
+                                var wifiComponent = item.GetComponent<WifiComponent>();
                                 if (wifiComponent != null)
                                 {
                                     wifiComponent.TeamID = teamID;
                                 }
+                                var idCard = item.GetComponent<IdCard>();
+                                if (idCard != null)
+                                {
+                                    idCard.TeamID = teamID;
+                                    idCard.SubmarineSpecificID = 0;
+                                }
                             }
                             break;
                         case 10: //NetEntityEvent.Type.UpdateExperience

Barotrauma/BarotraumaClient/ClientSource/Characters/Jobs/JobPrefab.cs

@@ -83,7 +83,13 @@ namespace Barotrauma
 
             var equipIdentifiers = Element.GetChildElements("ItemSet").Elements().Where(e => e.GetAttributeBool("outfit", false)).Select(e => e.GetAttributeString("identifier", ""));
 
-            var outfitPrefabs = ItemPrefab.Prefabs.Where(itemPrefab => equipIdentifiers.Contains(itemPrefab.Identifier)).ToList();
+            List<ItemPrefab> outfitPrefabs = new List<ItemPrefab>();
+            foreach (var equipIdentifier in equipIdentifiers)
+            {
+                var itemPrefab = ItemPrefab.Prefabs.Find(ip => ip.Identifier == equipIdentifier);
+                if (itemPrefab != null) { outfitPrefabs.Add(itemPrefab); }
+            }
+
             if (!outfitPrefabs.Any()) { return null; }
 
             for (int i = 0; i < outfitPrefabs.Count; i++)