diff --git a/src/main/java/mau/mau/Referee.java b/src/main/java/mau/mau/Referee.java index 5b34dc6..190381c 100644 --- a/src/main/java/mau/mau/Referee.java +++ b/src/main/java/mau/mau/Referee.java @@ -8,7 +8,8 @@ public class Referee { TYPENUM playedCardType = playedCard.getType(); VALUENUM playedCardValue = playedCard.getValue(); - return playedCardType == TYPENUM.JOKER + return currentCardType == TYPENUM.JOKER + || playedCardType == TYPENUM.JOKER || playedCardType == currentCardType || playedCardValue == currentCardValue; } diff --git a/src/main/java/mau/mau/players/Bot.java b/src/main/java/mau/mau/players/Bot.java index 155da22..bb41c06 100644 --- a/src/main/java/mau/mau/players/Bot.java +++ b/src/main/java/mau/mau/players/Bot.java @@ -6,8 +6,6 @@ import java.util.List; import java.util.Scanner; public class Bot extends Player { - private List hand; - private Dealer dealer; public Bot(Dealer dealer) { super(dealer); diff --git a/src/main/java/mau/mau/players/Human.java b/src/main/java/mau/mau/players/Human.java index 66a1bd4..bd2aff1 100644 --- a/src/main/java/mau/mau/players/Human.java +++ b/src/main/java/mau/mau/players/Human.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Scanner; public class Human extends Player { - private List hand; public Human(Dealer dealer) { super(dealer); diff --git a/src/main/java/mau/mau/players/Player.java b/src/main/java/mau/mau/players/Player.java index 61aa441..32459cb 100644 --- a/src/main/java/mau/mau/players/Player.java +++ b/src/main/java/mau/mau/players/Player.java @@ -6,6 +6,7 @@ import mau.mau.Dealer; import java.util.List; public abstract class Player { + private List hand; private Dealer dealer;