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;
     }