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

2021-10-27 14:41:47 -03:00
parent 8ef6ec90ca 234fb6bc06
commit bae2390eb1
450 changed files with 26043 additions and 10457 deletions
@@ -28,6 +28,16 @@ namespace Barotrauma
                }
            }
            GameMain.Lua.hook.Call("characterDeath", new object[] { this,causeOfDeathAffliction });
+
+            if (HasAbilityFlag(AbilityFlags.RetainExperienceForNewCharacter))
+            {
+                var ownerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
+                if (ownerClient != null)
+                {
+                    (GameMain.GameSession?.GameMode as MultiPlayerCampaign)?.SaveExperiencePoints(ownerClient);
+                }
+            }
+
            healthUpdateTimer = 0.0f;

            if (CauseOfDeath.Killer != null && CauseOfDeath.Killer.IsTraitor && CauseOfDeath.Killer != this)
@@ -49,5 +59,10 @@ namespace Barotrauma
                }
            }
        }
+
+        partial void OnMoneyChanged(int prevAmount, int newAmount)
+        {
+            GameMain.NetworkMember.CreateEntityEvent(this, new object[] { NetEntityEvent.Type.UpdateMoney });
+        }
    }
 }