Merge branch 'master' into parkour

This commit is contained in:
Leijurv
2018-09-07 20:45:10 -07:00
10 changed files with 27 additions and 61 deletions
@@ -274,6 +274,11 @@ public abstract class Movement implements Helper, MovementHelper {
} else if (state.getStatus() == MovementStatus.PREPPING) {
state.setStatus(MovementStatus.WAITING);
}
if (state.getStatus() == MovementStatus.WAITING) {
state.setStatus(MovementStatus.RUNNING);
}
return state;
}