#82 Show discarded cards as skat instead of dealt skat

b0n541 · Nov 18, 2020 · 35c4ffd · 35c4ffd
1 parent 778d08e
commit 35c4ffd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/jskat-base/src/main/java/org/jskat/control/SkatGame.java b/jskat-base/src/main/java/org/jskat/control/SkatGame.java
@@ -1041,7 +1041,7 @@ public void setGameState(GameState newState) {
 
                 // FIXME: merge this event with the command
                 JSkatEventBus.INSTANCE.post(new TableGameMoveEvent(tableName, new GameFinishEvent(getGameSummary())));
-                JSkatEventBus.INSTANCE.post(new ShowCardsCommand(tableName, data.getCardsAfterDiscard(), data.getDealtSkat()));
+                JSkatEventBus.INSTANCE.post(new ShowCardsCommand(tableName, data.getCardsAfterDiscard(), data.getSkat()));
             }
         }
     }

diff --git a/jskat-base/src/main/java/org/jskat/control/SkatGameReplayer.java b/jskat-base/src/main/java/org/jskat/control/SkatGameReplayer.java
@@ -41,8 +41,7 @@ public class SkatGameReplayer {
     private final List<SkatGameEvent> gameMoves = new ArrayList<>();
     private int currentMove = 0;
 
-    public SkatGameReplayer(JSkatView view, String tableName,
-							List<SkatGameEvent> gameMoves) throws InterruptedException {
+    public SkatGameReplayer(JSkatView view, String tableName, List<SkatGameEvent> gameMoves) {
         this.view = view;
         this.tableName = tableName;
         this.gameMoves.addAll(gameMoves);
@@ -110,7 +109,7 @@ private void oneStepForward() {
                 && data.getCurrentTrick().getFirstCard() == null) {
             JSkatEventBus.TABLE_EVENT_BUSSES.get(tableName).post(new TrickCompletedEvent(data.getLastCompletedTrick()));
         } else if (event instanceof GameFinishEvent) {
-            JSkatEventBus.INSTANCE.post(new ShowCardsCommand(tableName, data.getCardsAfterDiscard(), data.getDealtSkat()));
+            JSkatEventBus.INSTANCE.post(new ShowCardsCommand(tableName, data.getCardsAfterDiscard(), data.getSkat()));
         }
 
         event.processForward(data);

diff --git a/jskat-base/src/main/java/org/jskat/control/iss/IssController.java b/jskat-base/src/main/java/org/jskat/control/iss/IssController.java
@@ -578,7 +578,7 @@ public void endGame(String tableName, SkatGameData newGameData) {
         view.setGameState(tableName, GameState.GAME_OVER);
         // FIXME: merge event and command
         eventBus.post(new TableGameMoveEvent(tableName, new GameFinishEvent(newGameData.getGameSummary())));
-        eventBus.post(new ShowCardsCommand(tableName, newGameData.getCardsAfterDiscard(), newGameData.getDealtSkat()));
+        eventBus.post(new ShowCardsCommand(tableName, newGameData.getCardsAfterDiscard(), newGameData.getSkat()));
         gameData.put(tableName, newGameData);
     }