Changes by jorda
This commit is contained in:
@@ -8,7 +8,8 @@ public class Referee {
|
|||||||
TYPENUM playedCardType = playedCard.getType();
|
TYPENUM playedCardType = playedCard.getType();
|
||||||
VALUENUM playedCardValue = playedCard.getValue();
|
VALUENUM playedCardValue = playedCard.getValue();
|
||||||
|
|
||||||
return playedCardType == TYPENUM.JOKER
|
return currentCardType == TYPENUM.JOKER
|
||||||
|
|| playedCardType == TYPENUM.JOKER
|
||||||
|| playedCardType == currentCardType
|
|| playedCardType == currentCardType
|
||||||
|| playedCardValue == currentCardValue;
|
|| playedCardValue == currentCardValue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,6 @@ import java.util.List;
|
|||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
public class Bot extends Player {
|
public class Bot extends Player {
|
||||||
private List<Card> hand;
|
|
||||||
private Dealer dealer;
|
|
||||||
|
|
||||||
public Bot(Dealer dealer) {
|
public Bot(Dealer dealer) {
|
||||||
super(dealer);
|
super(dealer);
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import java.util.List;
|
|||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
public class Human extends Player {
|
public class Human extends Player {
|
||||||
private List<Card> hand;
|
|
||||||
|
|
||||||
public Human(Dealer dealer) {
|
public Human(Dealer dealer) {
|
||||||
super(dealer);
|
super(dealer);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import mau.mau.Dealer;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class Player {
|
public abstract class Player {
|
||||||
|
|
||||||
private List<Card> hand;
|
private List<Card> hand;
|
||||||
private Dealer dealer;
|
private Dealer dealer;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user