diff --git a/GamePlay/Frames/Frame.java b/GamePlay/Frames/Frame.java index 695e923..756f9ea 100644 --- a/GamePlay/Frames/Frame.java +++ b/GamePlay/Frames/Frame.java @@ -15,6 +15,7 @@ public class Frame { private ArrayList actHitBox; private ArrayList passThrowHitBox; private ArrayList actThrowHitBox; + private Push_HitBox pushHitBox; public Frame() { diff --git a/GamePlay/Hitboxes/HitBox.java b/GamePlay/Hitboxes/HitBox.java index 3971c62..d0ac360 100644 --- a/GamePlay/Hitboxes/HitBox.java +++ b/GamePlay/Hitboxes/HitBox.java @@ -70,12 +70,12 @@ public class HitBox { /* * HitBox overlap horizontally */ - if(this.position_x <= hb.position_x) { //this is at left of hb - if(hb.position_x <= horizontal1) { + if(this.position_x < hb.position_x) { //this is at left of hb + if(hb.position_x < horizontal1) { horiz = true; } }else {//this is at left of hb - if(this.position_x <= horizontal2) { + if(this.position_x < horizontal2) { horiz = true; } } @@ -83,12 +83,12 @@ public class HitBox { /* * HitBox overlap vertically */ - if(this.position_y <= hb.position_y) { //this is at top of hb - if(hb.position_y <= vertical1) { + if(this.position_y < hb.position_y) { //this is at top of hb + if(hb.position_y < vertical1) { ver = true; } }else {//this is at left of hb - if(this.position_x <= vertical2) { + if(this.position_x < vertical2) { ver = true; } }