From 0fce2fb5d2cd9f186567716c8e628852885cbe7b Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Mon, 9 Dec 2024 19:11:45 +0100 Subject: [PATCH] added the possiblity when the drawpile has only 1 card the discard pile will be shuffeled and then put into the draw pile. --- Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 bf601717..8aae71db 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 @@ -107,9 +107,13 @@ private void initializeDrawPile() { */ public PowerCard draw() { if (!this.drawPile.isEmpty()) { + if (drawPile.size() == 1){ + Collections.shuffle(this.discardPile); + this.drawPile.addAll(this.discardPile); + discardPile.clear(); + } return this.drawPile.remove(0); } - return null; }