Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterInfo.cs

@@ -10,6 +10,11 @@ namespace Barotrauma
     {
         private readonly Dictionary<Identifier, float> prevSentSkill = new Dictionary<Identifier, float>();
 
+        /// <summary>
+        /// The client opted to create a new character and discard this one
+        /// </summary>
+        public bool Discarded;
+
         partial void OnSkillChanged(Identifier skillIdentifier, float prevLevel, float newLevel)
         {
             if (Character == null || Character.Removed) { return; }
@@ -37,7 +42,7 @@ namespace Barotrauma
         partial void OnPermanentStatChanged(StatTypes statType)
         {
             if (Character == null || Character.Removed) { return; }
-            GameMain.NetworkMember.CreateEntityEvent(Character, new Character.UpdatePermanentStatsEventData());
+            GameMain.NetworkMember.CreateEntityEvent(Character, new Character.UpdatePermanentStatsEventData(statType));
         }
 
         public void ServerWrite(IWriteMessage msg)

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -647,6 +647,7 @@ namespace Barotrauma
             {
                 msg.Write(false);
             }
+            msg.Write(HumanPrefabHealthMultiplier);
             msg.Write(Wallet.Balance);
             msg.WriteRangedInteger(Wallet.RewardDistribution, 0, 100);
             msg.Write((byte)TeamID);