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
@@ -300,7 +300,7 @@ namespace Barotrauma.Networking
                if (hull.Submarine != RespawnShuttle) { continue; }
                hull.OxygenPercentage = 100.0f;
                hull.WaterVolume = 0.0f;
-                hull.BallastFlora?.Kill();
+                hull.BallastFlora?.Remove();
            }

            Dictionary<Character, Vector2> characterPositions = new Dictionary<Character, Vector2>();
@@ -1,17 +1,12 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Extensions;
+using Barotrauma.IO;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Globalization;
-using Barotrauma.IO;
 using System.Linq;
-using System.Net;
 using System.Security.Cryptography;
 using System.Text;
-using System.Xml;
-using System.Xml.Linq;
-using Barotrauma.Extensions;

 namespace Barotrauma.Networking
 {