fix npe caused be last commit changes

This commit is contained in:
yugecin 2016-11-20 22:27:16 +01:00
parent 63144426d1
commit 44bcaf06f9

View File

@ -856,13 +856,15 @@ public class Game extends BasicGameState {
} }
GameObject g = gameObjects[objectIndex]; GameObject g = gameObjects[objectIndex];
if ((g.isCircle() || g.isSlider()) && g.getTime() <= trackPosition) { if (g.isCircle() || g.isSlider()) {
if (g.getTime() <= trackPosition) {
Cursor.lastObjColor = g.getColor(); Cursor.lastObjColor = g.getColor();
Cursor.lastMirroredObjColor = g.getMirroredColor(); Cursor.lastMirroredObjColor = g.getMirroredColor();
} else { } else {
Cursor.nextObjColor = g.getColor(); Cursor.nextObjColor = g.getColor();
Cursor.nextMirroredObjColor = g.getMirroredColor(); Cursor.nextMirroredObjColor = g.getMirroredColor();
} }
}
// timing points // timing points
if (timingPointIndex < beatmap.timingPoints.size()) { if (timingPointIndex < beatmap.timingPoints.size()) {