}\r
return null;\r
} else if (n == 1) { //next\r
- return nextEvent;\r
+ if (nextEvent != null && nextEvent.getTime() > time) {\r
+ return nextEvent;\r
+ }\r
+ return null;\r
} else if (n == 2) { //current or previous when in empty space\r
return currEvent;\r
}\r