From ad8a67b2744f192d2183e4ea2fc61b2148696c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Thu, 24 Jun 2021 02:55:39 +0200 Subject: [PATCH] hitboxes fixed --- src/gameplay/match/match.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 819ca17..d74d1db 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -381,6 +381,7 @@ public class match { case 21: try { handleThrows(p1, p2); + handleThrows(p2,p1); } catch (IndexOutOfBoundsException e) {} try { handleHits(p1, p2, inputsP2); @@ -584,7 +585,7 @@ public class match { || (!p1LooksRight && (atH.getPosX()+p1.getPosX()+ atH.getSize_x() < ptH.getPosX()+p2.getPosX()+ptH.getSize_x()) && (atH.getPosX() > ptH.getPosX())); - boolean touchV = (atH.getPosY() - atH.getSize_y() < ptH.getPosY()) && (atH.getPosY() > ptH.getPosY() - ptH.getSize_y()); + boolean touchV = (atH.getPosY()+p1.getPosY() - atH.getSize_y() < ptH.getPosY()+p2.getPosY()) && (atH.getPosY()+p1.getPosY() > ptH.getPosY()+p2.getPosY() - ptH.getSize_y()); if(touchH && touchV) { hit.setHasHit(true); tP.set(0,hit); @@ -616,7 +617,7 @@ public class match { || (!p1LooksRight && (aH.getPosX()+p1.getPosX()+ aH.getSize_x() < pH.getPosX()+p2.getPosX()+pH.getSize_x()) && (aH.getPosX() > pH.getPosX())); - boolean touchV = (aH.getPosY() - aH.getSize_y() < pH.getPosY()) && (aH.getPosY() > pH.getPosY() - pH.getSize_y()); + boolean touchV = (aH.getPosY()+p1.getPosY() - aH.getSize_y() < pH.getPosY()+p2.getPosY()) && (aH.getPosY()+p1.getPosY() > pH.getPosY()+p2.getPosY() - pH.getSize_y()); if(touchH && touchV) { getHit(p2,hit,inputsP2.getLatestInputs()); hit.setHasHit(true);