Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

2022-09-29 12:13:55 -03:00
parent 2d5cff1752 9ae6e35760
commit 77c63541eb
602 changed files with 19759 additions and 16312 deletions
@@ -132,11 +132,11 @@ namespace Barotrauma
            }
            else if (a.MouseButton != MouseButton.None)
            {
-                return a.MouseButton == b.MouseButton;
+                return !(b is null) && a.MouseButton == b.MouseButton;
            }
            else
            {
-                return a.Key.Equals(b.Key);
+                return !(b is null) && a.Key.Equals(b.Key);
            }
        }