From 0fa045b252b9bff22a2d46ca8db0f06d82c189f4 Mon Sep 17 00:00:00 2001
From: yschl <ys037@hdm-stuttgart.de>
Date: Thu, 22 Feb 2024 20:53:05 +0100
Subject: [PATCH] Fixed: Bombs not spawning and Marker disappearing while other
Bomb is spawning, -> But creates Exception
---
.../battlearena/Model/Entity/GameplayObjects/Bomb.java | 2 +-
.../de/hdm_stuttgart/battlearena/Model/Entity/Player.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
index 9a875a9b..f79708f7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
@@ -193,7 +193,7 @@ public class Bomb implements IEntity {
}
public void spawnExplosion(int spawnCordY, int spawnCordX, GraphicsContext graphicsContext){
- List<IEntity> explosionspawns = runtimeInfo.getExplosionspawns();
+ List<IEntity> explosionspawns = runtimeInfo.getGameplayObjects();
IEntity explosion = EntityFactory.createGameplayObject(ObjectType.EXPLOSION, spawnCordX * scaledTileSize, spawnCordY * scaledTileSize, graphicsContext);
explosionspawns.add(explosion);
runtimeInfo.setGameplayObjects(explosionspawns);
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 89287a60..c4f732ca 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
@@ -358,17 +358,17 @@ class Player implements IEntity {
gameplayObjects.add(marker);
runtimeInfo.setGameplayObjects(gameplayObjects);
log.debug("Player 1 marker placed");
- //isTeleportItemFrame = false;
+
} else if (isTeleportItemFrame && TileManager.tileMap[yTile][xTile] < 10 && PLAYER_MODE == PlayerMode.PLAYER_TWO) {
player = 2;
IEntity marker = EntityFactory.createMarker(ObjectType.MARKER, xTile * scaledTileSize, yTile * scaledTileSize, graphicsContext, player);
gameplayObjects.add(marker);
runtimeInfo.setGameplayObjects(gameplayObjects);
log.debug("Player 2 marker placed");
- //isTeleportItemFrame = false;
+
}
- //checkTilePlacing(yTile, xTile);
+
return true;
}
--
GitLab