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 2203eaa5cbe9b440a8b3da2f529ef3ffaa45a2f5..29223dd95d73b1b9120baafd6dc5890a61048606 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 @@ -299,15 +299,12 @@ class Player implements IEntity { int lastyTile = yTile; - int pos; + if (PLAYER_MODE == PlayerMode.PLAYER_ONE && !markerPlacedPlayerOne) { markerPlacedPlayerOne = findNearestTpTile(yTile, xTile, graphicsContext); - - } if (PLAYER_MODE == PlayerMode.PLAYER_TWO && !markerPlacedPlayerTwo) { markerPlacedPlayerTwo = findNearestTpTile(yTile, xTile, graphicsContext); - } lastMapPosX = mapPosX; @@ -531,7 +528,6 @@ class Player implements IEntity { List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects(); if (inputHandler.isBomb() && PLAYER_MODE == PlayerMode.PLAYER_ONE && bombPlacementRate == 0 || inputHandler.isSdBomb() && PLAYER_MODE == PlayerMode.PLAYER_TWO && bombPlacementRate == 0) { - sfx.playSoundEffectOnce(SFX.BOMB); blastradius = updateBlastradius(blastradius); if (isBigBombItemFrame && !isTeleportItemFrame) { @@ -541,6 +537,7 @@ class Player implements IEntity { int yTile = (pixelpadding + mapPosY) / scaledTileSize; if (TileManager.tileMap[yTile][xTile] < 10) { + sfx.playSoundEffectOnce(SFX.BOMB); IEntity bigbomb = EntityFactory.createBombs(ObjectType.BIG_BOMB, xTile * scaledTileSize, yTile * scaledTileSize, graphicsContext, blastradius); gameplayObjects.add(bigbomb); runtimeInfo.setGameplayObjects(gameplayObjects); @@ -574,10 +571,11 @@ class Player implements IEntity { } else if (!isTeleportItemFrame) { log.debug("No BigBomb Itemframes in the List"); bombPlacementRate = bombReducedPlacementRate; - int xTile = mapPosX / scaledTileSize; - int yTile = mapPosY / scaledTileSize; + int xTile = (pixelpadding + mapPosX) / scaledTileSize; + int yTile = (pixelpadding + mapPosY) / scaledTileSize; if (TileManager.tileMap[yTile][xTile] < 10) { + sfx.playSoundEffectOnce(SFX.BOMB); IEntity bomb = EntityFactory.createBombs(ObjectType.BOMB, xTile * scaledTileSize, yTile * scaledTileSize, graphicsContext, blastradius); gameplayObjects.add(bomb); runtimeInfo.setGameplayObjects(gameplayObjects);