Fixed issue ucsb-cs56-projects#52, made progress in issue ucsb-cs56-p…

…rojects#7
davidtsu · Nov 9, 2016 · 9b892e0 · 9b892e0
1 parent 070f17a
commit 9b892e0
Show file tree

Hide file tree

Showing 4 changed files with 221 additions and 129 deletions.
diff --git a/dist/cs56_W13_blackjack.jar b/dist/cs56_W13_blackjack.jar
diff --git a/src/edu/ucsb/cs56/projects/game/blackjack/Blackjack.java b/src/edu/ucsb/cs56/projects/game/blackjack/Blackjack.java
@@ -349,14 +349,14 @@ else if(player.hasBlackjack()) // if player has a blackjack, player wins
 	    return 'P';
 	else if (dealer.getNumberOfCards() == 5) // if dealer has a 5 card charlie, dealer wins
 	    return 'D';
-	else if (player.getNumberOfCards() == 5) // if player has a 5 card charlie, player wins 
+	else if (player.getNumberOfCards() == 5 || player.getNumberOfCards2() == 5) // if player has a 5 card charlie, player wins. checks both hands if split.
 	    return 'P';
 	else if(dealer.getSecondHandValue() >= 
 		player.getSecondHandValue() && 
 		dealer.getSecondHandValue() >= 
-		player.getHandValue())
+		player.getHandValue()) //in the case of an Ace
 	    return 'D';
-	else if(dealer.getHandValue() >= player.getSecondHandValue() && dealer.getHandValue() >= player.getHandValue())
+	else if(dealer.getHandValue() >= player.getSecondHandValue() && dealer.getHandValue() >= player.getHandValue()) //in the case of an Ace
 	    return 'D';
 	else
 	    return 'P';