Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java

@@ -55,7 +55,7 @@ public void setPossibleEnemyPieces(ArrayList<Piece> possibleEnemyPieces) {
     }
 
     @Override
-    public void selectPiece(Piece piece){
+    public void selectPiece(Piece piece) {
         if (possibleOwnPieces.contains(piece)){
             selectedOwnPiece = piece;
         } else if (possibleEnemyPieces.contains(piece)){
@@ -67,6 +67,8 @@ public void selectPiece(Piece piece){
             temp.add(selectedEnemyPiece);
             System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1));
             logic.send(new SelectedPiecesMessage(temp));
+            selectedEnemyPiece = null;
+            selectedOwnPiece = null;
         }
     }
 

Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java

@@ -88,7 +88,7 @@ public Game() {
         initializeDrawPile();
         board = new Board();
         die = new Die(1,2,
-                      5, 1,1,1
+                      1,1,6,1
         );
     }