diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ActionControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ActionControl.java index eb741e9e..542a1f9c 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ActionControl.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/animation/ActionControl.java @@ -12,7 +12,8 @@ public ActionControl(Runnable runnable){ protected void action(){ - if(runnable == null) throw new RuntimeException("runnable is null"); - else runnable.run(); + if(null != runnable) { + runnable.run(); + } } } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index 4cdbb3af..08ee128c 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -831,7 +831,7 @@ private void throwBomb(UUID uuid) { } private void throwMatrix(UUID uuid) { - //app.getAcousticHandler().playSound(MdgaSound.MATRIX); + app.getAcousticHandler().playSound(MdgaSound.MATRIX); Spatial piece = pieces.get(uuid).getSpatial(); piece.addControl(new MatrixAnimation(app, radarPos,()-> { piece.addControl(new FadeControl(1,1,0, diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java index 6f88dfd5..86bcc509 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java @@ -27,7 +27,6 @@ public WaitingPieceState(ClientState parent, ClientGameLogic logic) { @Override public void enter() { moveablePiece = null; - } @Override