1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00

Prevent multiple enumeration in checkForOverlap

This commit is contained in:
Henry Lin 2021-07-01 12:49:34 +08:00
parent 34be437d7a
commit b0a619bb4c

View File

@ -300,6 +300,9 @@ namespace osu.Game.Rulesets.Osu.Mods
var tryCount = 0;
// for checking overlap
var precedingObjects = hitObjects.SkipLast(hitObjects.Count - i).TakeLast(overlap_check_count).ToList();
do
{
if (tryCount > 0) direction = two_pi * nextSingle();
@ -320,7 +323,7 @@ namespace osu.Game.Rulesets.Osu.Mods
tryCount++;
if (tryCount % 10 == 0) distance *= 0.9f;
} while (distance >= obj.Radius * 2 && checkForOverlap(hitObjects.SkipLast(hitObjects.Count - i).TakeLast(overlap_check_count), obj));
} while (distance >= obj.Radius * 2 && checkForOverlap(precedingObjects, obj));
if (obj.LastInCombo)
direction = two_pi * nextSingle();