github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-24 19:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed AI infinite loop on wrong answers input (tests affected)

Browse source
This commit is contained in:
Oleg Agafonov 2018-01-04 18:14:22 +04:00
parent 401146f65f
commit 3d53d28f5e
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
View file

@ -767,7 +767,9 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ {
return super.choose(outcome, choice, game); return super.choose(outcome, choice, game);
} }
if (!choice.isChosen()) { if (!choice.isChosen()) {
return choice.setChoiceByAnswers(choices, true); if(!choice.setChoiceByAnswers(choices, true)){
choice.setRandomChoice();
}
} }
return true; return true;
} }

4
Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
View file

@ -478,7 +478,9 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player {
} }
if (!choice.isChosen()) { if (!choice.isChosen()) {
return choice.setChoiceByAnswers(choices, true); if(!choice.setChoiceByAnswers(choices, true)){
choice.setRandomChoice();
}
} }
return true; return true;

4
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -740,7 +740,9 @@ public class TestPlayer implements Player {
@Override @Override
public boolean choose(Outcome outcome, Choice choice, Game game) { public boolean choose(Outcome outcome, Choice choice, Game game) {
if (!choices.isEmpty()) { if (!choices.isEmpty()) {
return choice.setChoiceByAnswers(choices, true); if(choice.setChoiceByAnswers(choices, true)){
return true;
}
} }
return computerPlayer.choose(outcome, choice, game); return computerPlayer.choose(outcome, choice, game);
} }