changed match.nextFrame so it works properly with the new nextFrameBuffer
This commit is contained in:
parent
9a8e13bfb5
commit
913ccd4de1
@ -707,10 +707,8 @@ public class match {
|
||||
* @param in the input buffer corresponding to the character
|
||||
*/
|
||||
private static void nextFrame(Character c, InputBuffer in) {
|
||||
try {
|
||||
//if(!c.getFrames().getNextframe().equals(null)){
|
||||
c.goToNextFrames();
|
||||
} catch (NullPointerException e) {
|
||||
c.goToNextFrames();
|
||||
if (c.getFrames().size() == 0) {
|
||||
switch(c.getStatus()) {
|
||||
case FALLING:case HITINAIR:
|
||||
if(c.getPosY() > groundLevel){
|
||||
@ -722,6 +720,15 @@ public class match {
|
||||
c.addNextFrames(c.getKnockedDownFrames());
|
||||
}
|
||||
break;
|
||||
case JUMPING:
|
||||
if(c.getPosY() > groundLevel) {
|
||||
c.setCurrentFrame(c.getNeutralJump().getFrame().get(c.getNeutralJump().getFrame().size() - 1));
|
||||
} else {
|
||||
c.setPos(c.getPosX(),groundLevel);
|
||||
c.setStatus(Status.NORMAL);
|
||||
c.addNextFrames(c.getDefaultStandingFrames());
|
||||
}
|
||||
break;
|
||||
default:
|
||||
c.setStatus(Status.NORMAL);
|
||||
if(in.getLatestInputs().containsInput(ButtonIG.DOWN)) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user