Merge branch 'yugecin/opsu/aspire-fix'

# Conflicts: # src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
2016-12-10 01:32:04 +01:00
parent 84cb6d34e2 fdf936e47b
commit c0acb7ad6b
3 changed files with 11 additions and 3 deletions
--- a/src/itdelatrisu/opsu/beatmap/TimingPoint.java
+++ b/src/itdelatrisu/opsu/beatmap/TimingPoint.java
@@ -98,7 +98,7 @@ public class TimingPoint {
 	/**
 	 * Returns the slider multiplier. [INHERITED]
 	 */
-	public float getSliderMultiplier() { return velocity / -100f; }
+	public float getSliderMultiplier() { return Utils.clamp(-velocity, 10, 1000) / 100f; }

 	/**
 	 * Returns the meter.