github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug of computer player handling TargetCreatureOrPlayerAmount.

Browse source
This commit is contained in:
LevelX2 2014-08-18 23:52:35 +02:00
parent edd1563c12
commit d46b4a7248
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -692,7 +692,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
}
UUID opponentId = game.getOpponents(playerId).iterator().next();
if (target instanceof TargetCreatureOrPlayerAmount) {
if (game.getPlayer(opponentId).getLife() <= target.getAmountRemaining()) {
if (outcome.equals(Outcome.Damage) && game.getPlayer(opponentId).getLife() <= target.getAmountRemaining()) {
target.addTarget(opponentId, target.getAmountRemaining(), source, game);
return true;
}
@ -711,6 +711,17 @@ public class ComputerPlayer extends PlayerImpl implements Player {
}
}
}
if (outcome.isGood() && target.canTarget(playerId, playerId, source, game)) {
target.addTarget(opponentId, target.getAmountRemaining(), source, game);
return true;
} else if (target.canTarget(playerId, opponentId, source, game)){
// no permanent target so take opponent
target.addTarget(opponentId, target.getAmountRemaining(), source, game);
return true;
} else if (target.canTarget(playerId, playerId, source, game)) {
target.addTarget(opponentId, target.getAmountRemaining(), source, game);
return true;
}
}
return false;
}