Unstable 0.16.3.0

2022-02-10 02:52:08 +09:00
parent 6814a11520
commit 2190fe08ef
115 changed files with 993 additions and 453 deletions
@@ -1178,7 +1178,7 @@ namespace Barotrauma
                if ((s.damageRange == Vector2.Zero ||
                    (damage >= s.damageRange.X && damage <= s.damageRange.Y)) &&
                    string.Equals(s.damageType, damageType, StringComparison.OrdinalIgnoreCase) &&
-                    (tags == null ? string.IsNullOrEmpty(s.requiredTag) : tags.Contains(s.requiredTag)))
+                    (string.IsNullOrEmpty(s.requiredTag) || (tags == null ? string.IsNullOrEmpty(s.requiredTag) : tags.Contains(s.requiredTag))))
                {
                    tempList.Add(s);
                }