Merge branch 'yugecin/opsu/aspire-fix'

# Conflicts:
#	src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
This commit is contained in:
yugecin
2016-12-10 01:32:04 +01:00
3 changed files with 11 additions and 3 deletions

View File

@@ -111,7 +111,7 @@ public abstract class EqualDistanceMultiCurve extends Curve {
int cnt = 1;
if (cnt > ncurve) {
return; // TODO this prevents aspire map from crashing the game, but does it breaks stuff?
return;
}
Vec2f c2 = curve[cnt++];