post merge stuff

2016-12-24 14:35:36 +01:00
parent a6540044b6
commit 20194d58b3
7 changed files with 77 additions and 43 deletions
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -462,8 +462,12 @@ public class Game extends BasicGameState {
 					autoMousePressed = true;
 				}
 			} else {
-				// last object
-				autoPoint = gameObjects[objectIndex - 1].getPointAt(trackPosition);
+				if (objectIndex < beatmap.objects.length) {
+					autoPoint = gameObjects[objectIndex].getPointAt(trackPosition);
+				} else {
+					// last object
+					autoPoint = gameObjects[objectIndex - 1].getPointAt(trackPosition);
+				}
 			}

 			// set mouse coordinates