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

2022-07-14 12:25:44 -03:00
parent 5540330295 f6b226ea7e
commit c5860d13d5
86 changed files with 839 additions and 412 deletions
@@ -338,9 +338,7 @@ namespace Barotrauma.Items.Components
                if (user == null) { return; }
                if (GameMain.GameSession?.GameMode is MultiPlayerCampaign mpCampaign)
                {
-#if CLIENT
-                    mpCampaign.TryPurchase(null, fabricatedItem.RequiredMoney);
-#elif SERVER
+#if SERVER
                    if (GetUsingClient() is { } client)
                    {
                        mpCampaign.TryPurchase(client, fabricatedItem.RequiredMoney);
@@ -142,9 +142,8 @@ namespace Barotrauma.Items.Components
            //less effective when in a bad condition
            currFlow *= MathHelper.Lerp(0.5f, 1.0f, item.Condition / item.MaxCondition);

-            item.CurrentHull.WaterVolume += currFlow * deltaTime * Timing.FixedUpdateRate;
+            item.CurrentHull.WaterVolume += currFlow * deltaTime * Timing.FixedUpdateRate; 
            if (item.CurrentHull.WaterVolume > item.CurrentHull.Volume) { item.CurrentHull.Pressure += 30.0f * deltaTime; }
-
        }

        public void InfectBallast(Identifier identifier, bool allowMultiplePerShip = false)