diff --git a/bin/cards/maumau/model/ActionHandler.class b/bin/cards/maumau/model/ActionHandler.class index 32c8091..df7e014 100644 Binary files a/bin/cards/maumau/model/ActionHandler.class and b/bin/cards/maumau/model/ActionHandler.class differ diff --git a/src/cards/maumau/model/ActionHandler.java b/src/cards/maumau/model/ActionHandler.java index 49574f0..801ab73 100644 --- a/src/cards/maumau/model/ActionHandler.java +++ b/src/cards/maumau/model/ActionHandler.java @@ -165,16 +165,20 @@ public class ActionHandler { * @return True if the card can be played, false otherwise. */ public boolean canPlay(Card c) { - if (chosenSuit == null) { - if (c.rank() == Rank.JACK) { - return true; - } else if (c.rank() == game.getCardHandler().getDiscardPile().getFirst().rank()) { - return true; - } else if (c.suit() == game.getCardHandler().getDiscardPile().getFirst().suit()) { - return true; - } + if (ctr7 == 0 || c.rank() == Rank.SEVEN) { + + if (chosenSuit == null) { + if (c.rank() == Rank.JACK) { + return true; + } else if (c.rank() == game.getCardHandler().getDiscardPile().getFirst().rank()) { + return true; + } else if (c.suit() == game.getCardHandler().getDiscardPile().getFirst().suit()) { + return true; + } + } } + if (c.suit() == chosenSuit) { return true; }