Character death syncing, characters don't reselect items when they receive a network msg about an item they have already selected

Subsurface/Source/Characters/AICharacter.cs

@@ -47,7 +47,7 @@ namespace Barotrauma
                 AnimController.SimplePhysicsEnabled = false;
             }
 
-            if (isDead || Health <= 0.0f) return;
+            if (IsDead || Health <= 0.0f) return;
 
             if (Controlled == this || !aiController.Enabled) return;
 
@@ -76,7 +76,7 @@ namespace Barotrauma
         {
             base.DrawFront(spriteBatch,cam);
 
-            if (GameMain.DebugDraw && !isDead) aiController.DebugDraw(spriteBatch);
+            if (GameMain.DebugDraw && !IsDead) aiController.DebugDraw(spriteBatch);
         }
 
         public override void AddDamage(CauseOfDeath causeOfDeath, float amount, IDamageable attacker)

Subsurface/Source/Characters/Character.cs

@@ -130,7 +130,7 @@ namespace Barotrauma
 
         private Dictionary<object, HUDProgressBar> hudProgressBars;
 
-        protected bool isDead;
+        private bool isDead;
         private CauseOfDeath lastAttackCauseOfDeath;
         private CauseOfDeath causeOfDeath;
         
@@ -360,6 +360,8 @@ namespace Barotrauma
             set 
             {
                 if (!MathUtils.IsValid(value)) return;
+                if (GameMain.Client != null) return;
+
                 float newBleeding =  MathHelper.Clamp(value, 0.0f, 5.0f);
                 if (newBleeding == bleeding) return;
 
@@ -1888,6 +1890,7 @@ namespace Barotrauma
             PlaySound(CharacterSound.SoundType.Die);
             
             isDead = true;
+
             this.causeOfDeath = causeOfDeath;
             AnimController.movement = Vector2.Zero;
             AnimController.TargetMovement = Vector2.Zero;
@@ -2154,8 +2157,11 @@ namespace Barotrauma
                             }
                             else if (selectedEntity is Item)
                             {
-                                selectedConstruction = (Item)selectedEntity;
+                                var newSelectedConstruction = (Item)selectedEntity;
-                                if (selectedConstruction != null) selectedConstruction.Pick(this, true, true);
+                                if (newSelectedConstruction != null && selectedConstruction != newSelectedConstruction)
+                                {
+                                    newSelectedConstruction.Pick(this, true, true);
+                                }
                             }
                         }
                         else
@@ -2219,6 +2225,13 @@ namespace Barotrauma
                 return;
             }
 
+            msg.Write(isDead);
+            if (isDead)
+            {
+                msg.Write((byte)causeOfDeath);
+            }
+            else
+            {
                 msg.WriteRangedSingle(health, minHealth, maxHealth, 8);
 
                 msg.Write(oxygen < 100.0f);
@@ -2240,6 +2253,7 @@ namespace Barotrauma
                     msg.WriteRangedSingle(Stun, 0.0f, 60.0f, 8);
                 }
             }
+        }
 
         private void ReadStatus(NetBuffer msg)
         {
@@ -2249,6 +2263,21 @@ namespace Barotrauma
                 return;
             }
 
+            bool isDead = msg.ReadBoolean();
+            if (isDead)
+            {
+                causeOfDeath = (CauseOfDeath)msg.ReadByte();
+                if (causeOfDeath == CauseOfDeath.Pressure)
+                {
+                    Implode(true);
+                }
+                else
+                {
+                    Kill(causeOfDeath, true);
+                }
+            }
+            else
+            {
                 health = msg.ReadRangedSingle(minHealth, maxHealth, 8);
 
                 bool lowOxygen = msg.ReadBoolean();
@@ -2260,7 +2289,7 @@ namespace Barotrauma
                 bool isBleeding = msg.ReadBoolean();
                 if (isBleeding)
                 {
-                Bleeding = msg.ReadRangedSingle(0.0f, 5.0f, 8);
+                    bleeding = msg.ReadRangedSingle(0.0f, 5.0f, 8);
                 }
 
                 bool stunned = msg.ReadBoolean();
@@ -2270,6 +2299,7 @@ namespace Barotrauma
                     StartStun(newStunTimer, true);
                 }
             }
+        }
 
         public void WriteSpawnData(NetBuffer msg)
         {