From 4d31fc098b097ab4735466885500b668b84b24b2 Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Tue, 10 Dec 2024 14:27:50 +0100
Subject: [PATCH] fixed swap bug

---
 .../client/gamestate/turnstate/powercardstate/SwapState.java  | 4 +++-
 Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java
index 9b9754aa..e12a3017 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java
+++ b/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;
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
index 37a91dd0..8bac5e64 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
+++ b/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
         );
     }