diff --git a/TheGameExtreme/model/gameActions/classic/GameMode.cs b/TheGameExtreme/model/gameActions/classic/GameMode.cs index 0f66fa9..bb974d7 100644 --- a/TheGameExtreme/model/gameActions/classic/GameMode.cs +++ b/TheGameExtreme/model/gameActions/classic/GameMode.cs @@ -140,9 +140,8 @@ namespace TheGameExtreme.model.gameActions.classic { pioche(currentHand, player); CurrentCardPlayed.Clear(); - OnPlayerChanged(null); - return false; + return ((TerminerSonTour)gameActions[2]).Test(currentHand); } else { diff --git a/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs b/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs index f8b636d..fff9626 100644 --- a/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs +++ b/TheGameExtreme/model/gameActions/classic/JouerUneCarte.cs @@ -50,7 +50,6 @@ namespace TheGameExtreme.model.gameActions.classic player.joue(card); CurrentCardPlayed.Add(card); stack.Push(card); - return true; } else diff --git a/TheGameExtreme/model/gameActions/classic/TerminerSonTour.cs b/TheGameExtreme/model/gameActions/classic/TerminerSonTour.cs index 2ad4c4c..ba84c39 100644 --- a/TheGameExtreme/model/gameActions/classic/TerminerSonTour.cs +++ b/TheGameExtreme/model/gameActions/classic/TerminerSonTour.cs @@ -17,9 +17,9 @@ namespace TheGameExtreme.model.gameActions.classic { // Si carte qui fait piocher que d'un, vérifier la bonne pioche (penser si elle vient d'être recouverte) // Sinon - if (nbCardAtBeginOfTurn == CurrentCardPlayed.Count || CurrentHand.Count == 0 || CurrentCardPlayed.Count >= 2) + if (CurrentHand.Count == 0 || CurrentCardPlayed.Count >= 2) { // Ne pas oublié de gérer les ThreeCard - return Test(CurrentHand); + return true; } else {