From 9ac35ccd7ea300496e091fa749c10cec7bb42809 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Mon, 30 May 2022 18:52:36 -0500
Subject: [PATCH] Fix getting stuck on vertical falling

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 maps/world1.map             | Bin 294912 -> 294912 bytes
 src/sig/objects/Player.java |  14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/maps/world1.map b/maps/world1.map
index 15331b081e04d4522bfed88681baee937e8c19e6..c4c1e13549698ad1f1aa93ded7ede9d5195b8c50 100644
GIT binary patch
delta 80
zcmZo@5Nc=;+Q6+K%)$Ty5E8^<W?<eZ_?USzzYP~VRBof-doZ6B%x@OZXcy361Y#y2
MX5KEK!SW#-0Qi{=od5s;

delta 64
zcmZo@5Nc=;+Q6+K%m4(8AOZ@Q8JIT;K4xCbZ^JT~--eHou~|T)T|k2oh?#(xdAooH
H%ZG3PU0@5^

diff --git a/src/sig/objects/Player.java b/src/sig/objects/Player.java
index ed0650f..401f98d 100644
--- a/src/sig/objects/Player.java
+++ b/src/sig/objects/Player.java
@@ -27,6 +27,9 @@ public class Player extends Object{
     double horizontal_air_drag = 100;
     double horizontal_air_friction = 7;
 
+    int maxJumpCount=1;
+    int jumpCount=maxJumpCount;
+
     public Player(Panel panel) {
         super(panel);
         this.setSprite(Sprite.NANA_SMALL);
@@ -61,17 +64,18 @@ public class Player extends Object{
             }
             double check_distance_y = (displacement_y/4)*(i+1);
             double check_distance_x = (displacement_x/4)*(i+1);
-            Tile checked_tile_top_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth()/2-4+check_distance_x)/Tile.TILE_WIDTH, (int)(getY())/Tile.TILE_HEIGHT);
-            Tile checked_tile_top_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getSprite().getWidth()/2+4+check_distance_x)/Tile.TILE_WIDTH, (int)(getY())/Tile.TILE_HEIGHT);
-            Tile checked_tile_bottom_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth()/2)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2+check_distance_y)/Tile.TILE_HEIGHT);
-            Tile checked_tile_bottom_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getSprite().getWidth()/2)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2+check_distance_y)/Tile.TILE_HEIGHT);
+            Tile checked_tile_bottom_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth()/2-8)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2+check_distance_y)/Tile.TILE_HEIGHT);
+            Tile checked_tile_bottom_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getSprite().getWidth()/2+8)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2+check_distance_y)/Tile.TILE_HEIGHT);
             //System.out.println((int)getX()/Tile.TILE_WIDTH);
             if(!groundCollision&&checked_tile_bottom_right.getCollision()==CollisionType.BLOCK||checked_tile_bottom_left.getCollision()==CollisionType.BLOCK){
-                setY((getY()+check_distance_y));
+                setY((getY()-check_distance_y));
                 y_acceleration = 0;
                 y_velocity = 0;
                 groundCollision=true;
             }
+
+            Tile checked_tile_top_right = RabiClone.CURRENT_MAP.getTile((int)(getX()+getSprite().getWidth()/2-4+check_distance_x)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2)/Tile.TILE_HEIGHT);
+            Tile checked_tile_top_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getSprite().getWidth()/2+4+check_distance_x)/Tile.TILE_WIDTH, (int)(getY()+getSprite().getHeight()/2)/Tile.TILE_HEIGHT);
             if(!sideCollision&&checked_tile_top_right.getCollision()==CollisionType.BLOCK||checked_tile_top_left.getCollision()==CollisionType.BLOCK){
                 //System.out.println(checked_tile_top_right.getCollision()+"//"+checked_tile_top_left.getCollision());
                 setX((getX()-check_distance_x));