Fixed endless messagebox spam when the controlled character turns into a husk, fixed an index our of range exception when merging firesources

2017-07-09 16:17:44 +03:00
parent 2598bb1bd3
commit bd4c7d68d0
3 changed files with 5 additions and 7 deletions
@@ -117,11 +117,9 @@ namespace Barotrauma
            {
                for (int j = i - 1; j >= 0; j--)
                {
-                    if (fireSources[i].hull != fireSources[j].hull) continue;
-
                    i = Math.Min(i, fireSources.Count - 1);
                    j = Math.Min(j, i - 1);
-
+                    
                    if (!fireSources[i].CheckOverLap(fireSources[j])) continue;

                    float leftEdge = Math.Min(fireSources[i].position.X, fireSources[j].position.X);