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 9a875a9b8211432ad8491ecce4acd34d8fc55fce..f79708f7a1d503c7381295b267507172e7c346b1 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 89287a60d704868065d9af097382e1e7b58a65f3..c4f732caab3d4e271657e64d9e620609fbc7bd09 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; }