diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java
index 9d860c1af101e6002e51c846e70d219cee7772e1..675946aeef36f7e8453278393e233e854c76b04c 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java
@@ -48,19 +48,19 @@ public class CollisionHandler {
             case UP:
                 tileOne = tileMap[nextPlayerTop][leftColumn];
                 tileTwo = tileMap[nextPlayerTop][rightColumn];
-                return tileSet[tileOne].getCollision() || tileSet[tileTwo].getCollision();
+                return tileSet[tileOne].getCollision() && tileSet[tileTwo].getCollision();
             case DOWN:
                 tileOne = tileMap[nextPlayerBottom][leftColumn];
                 tileTwo = tileMap[nextPlayerBottom][rightColumn];
-                return tileSet[tileOne].getCollision() || tileSet[tileTwo].getCollision();
+                return tileSet[tileOne].getCollision() && tileSet[tileTwo].getCollision();
             case LEFT:
                 tileOne = tileMap[topRow][nextPlayerLeft];
                 tileTwo = tileMap[bottomRow][nextPlayerLeft];
-                return tileSet[tileOne].getCollision() || tileSet[tileTwo].getCollision();
+                return tileSet[tileOne].getCollision() && tileSet[tileTwo].getCollision();
             case RIGHT:
                 tileOne = tileMap[topRow][nextPlayerRight];
                 tileTwo = tileMap[bottomRow][nextPlayerRight];
-                return tileSet[tileOne].getCollision() || tileSet[tileTwo].getCollision();
+                return tileSet[tileOne].getCollision() && tileSet[tileTwo].getCollision();
             default:
                 return true;
         }
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
index 7916d026aea1670d4bec53ea0452a7708486ad7c..3e7c04f199b8612d7add279bcafae4944d9b2473 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
@@ -56,7 +56,7 @@ class Player implements IEntity {
     private int spriteNumber = 1;
 
     private final int playerWidth = 19;
-    private final int playerHeight = 35;
+    private final int playerHeight = 20;
 
     private int scaledTileSize;
 
@@ -285,7 +285,7 @@ class Player implements IEntity {
             }
         }
 
-        boxCollider = new BoundingBox(mapPosX + 15, mapPosY + 10, playerWidth, playerHeight);
+        boxCollider = new BoundingBox(mapPosX + 15, mapPosY + 20, playerWidth, playerHeight);
     }
 
     @Override