From 06b5fe8934d8e5823c32bae29451b4f08b72c3d0 Mon Sep 17 00:00:00 2001
From: Scherbaum Maximilian <ms622@hdm-stuttgart.de>
Date: Thu, 25 Jan 2024 16:01:41 +0100
Subject: [PATCH] fix: wrong detected collisions
---
.../battlearena/Model/Entity/CollisionHandler.java | 8 ++++----
.../de/hdm_stuttgart/battlearena/Model/Entity/Player.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
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 9d860c1a..675946ae 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 7916d026..3e7c04f1 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
--
GitLab