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

2023-05-10 11:55:46 -03:00
parent 768a1f309c 235d42b34f
commit 2c45c3d020
273 changed files with 5739 additions and 2421 deletions
@@ -394,7 +394,6 @@ namespace Barotrauma
            return SelectWeightedRandom(objects, weightMethod, Rand.GetRNG(randSync));
        }

-
        public static T SelectWeightedRandom<T>(IEnumerable<T> objects, Func<T, float> weightMethod, Random random)
        {
            List<T> objectList = objects.ToList();
@@ -409,7 +408,7 @@ namespace Barotrauma

        public static T SelectWeightedRandom<T>(IList<T> objects, IList<float> weights, Random random)
        {
-            if (objects.Count == 0) return default(T);
+            if (objects.Count == 0) { return default(T); }

            if (objects.Count != weights.Count)
            {