From cb40fc4937d5766d2079806400d1c8212f6e4c35 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Tue, 23 Jun 2020 20:53:51 +0200
Subject: [PATCH] Lol

---
 core/src/controller/Controller.java | 35 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java
index f14e20b..ad2a595 100644
--- a/core/src/controller/Controller.java
+++ b/core/src/controller/Controller.java
@@ -158,19 +158,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                         gs.step(level.get(currentChapter).get(currentLevel));
 
                         boolean collision = false;
+                        double tempX = level.get(currentChapter).get(currentLevel).getProjectile().getxPos();
+                        double tempY = level.get(currentChapter).get(currentLevel).getProjectile().getyPos();
+
                         for(Rectangle rect : gs.getGoalRects()){
                             if(Intersector.overlaps(gs.getProjectileCirc(), rect)) {
 
                                 collision = true;
-                                if (!isColliding) {
-                                    if (rect.getHeight() == 1) {
-                                        level.get(currentChapter).get(currentLevel).horizontalCollision();
-                                    } else if (rect.getWidth() == 1) {
-                                        level.get(currentChapter).get(currentLevel).verticalCollision();
-                                    }
-                                    isColliding = true;
-                                    break;
+                                if (rect.getHeight() == 1) {
+                                    level.get(currentChapter).get(currentLevel).horizontalCollision();
+                                } else if (rect.getWidth() == 1) {
+                                    level.get(currentChapter).get(currentLevel).verticalCollision();
                                 }
+                                break;
                             }
                         }
                         if(gs.getObjectRects() != null) {
@@ -178,21 +178,20 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                                 if (Intersector.overlaps(gs.getProjectileCirc(), rect)) {
 
                                     collision = true;
-                                    if (!isColliding) {
-                                        if (rect.getHeight() == 1) {
-                                            level.get(currentChapter).get(currentLevel).horizontalCollision();
-                                        } else if (rect.getWidth() == 1) {
-                                            level.get(currentChapter).get(currentLevel).verticalCollision();
-                                        }
-                                        isColliding = true;
-                                        break;
+                                    if (rect.getHeight() == 1) {
+                                        level.get(currentChapter).get(currentLevel).horizontalCollision();
+                                    } else if (rect.getWidth() == 1) {
+                                        level.get(currentChapter).get(currentLevel).verticalCollision();
                                     }
+                                    break;
+
                                 }
                             }
                         }
 
-                        if(!collision){
-                            isColliding = false;
+                        if(collision){
+                            level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
+                            level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY);
                         }
 
                     }