(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -215,11 +215,12 @@ namespace Barotrauma

        protected virtual void OnCompleted()
        {
-            if (Completed != null)
-            {
-                Completed();
-                Completed = null;
-            }
+            Completed?.Invoke();
+            //if (Completed != null)
+            //{
+            //    Completed();
+            //    Completed = null;
+            //}
        }

        public virtual void Reset() { }