diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java index c37e260..d3cd100 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java @@ -69,7 +69,10 @@ public class GameMusic extends AbstractAppState { /** * Plays the main music. */ - public void playMainMusic() { + private void playMainMusic() { + if (!isEnabled()) { + return; // Sound is disabled + } if (mainMusic != null && !isMainMusicPlaying) { mainMusic.play(); isMainMusicPlaying = true; @@ -79,7 +82,7 @@ public class GameMusic extends AbstractAppState { /** * Stops the main music. */ - public void stopMainMusic() { + private void stopMainMusic() { if (mainMusic != null && isMainMusicPlaying) { mainMusic.stop(); isMainMusicPlaying = false; @@ -92,7 +95,10 @@ public class GameMusic extends AbstractAppState { * @param app The application instance * @param secondaryMusicFile The file path of the secondary audio file */ - public void playSecondaryMusic() { + private void playSecondaryMusic() { + if(!isEnabled()) { + return; + } if (isSecondaryMusicPlaying) { return; // Secondary music is already playing } @@ -109,7 +115,7 @@ public class GameMusic extends AbstractAppState { /** * Stops the secondary music. */ - public void stopSecondaryMusic() { + private void stopSecondaryMusic() { if (secondaryMusic != null && isSecondaryMusicPlaying) { secondaryMusic.stop(); isSecondaryMusicPlaying = false; @@ -125,6 +131,9 @@ public class GameMusic extends AbstractAppState { * @param secondaryMusicFile The file path of the secondary audio file */ public void toggleMusic() { + if(!isEnabled()) { + return; + } if (isSecondaryMusicPlaying) { stopSecondaryMusic(); playMainMusic();