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

* UI: fixed infinite popup messages about illegal action while skip button activated (#4685);

Browse source
This commit is contained in:
Oleg Agafonov 2019-04-05 13:11:27 +04:00
parent fed433657c
commit 57283c3cca
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -523,6 +523,7 @@ public class Combat implements Serializable, Copyable<Combat> {
if (!effect.canAttackCheckAfter(numberAttackers, ability, game, true)) { if (!effect.canAttackCheckAfter(numberAttackers, ability, game, true)) {
MageObject sourceObject = ability.getSourceObject(game); MageObject sourceObject = ability.getSourceObject(game);
if (attackingPlayer.isHuman()) { if (attackingPlayer.isHuman()) {
attackingPlayer.resetPlayerPassedActions();
game.informPlayer(attackingPlayer, attackingCreature.getIdName() + " can't attack this way (" + (sourceObject == null ? "null" : sourceObject.getIdName()) + ')'); game.informPlayer(attackingPlayer, attackingCreature.getIdName() + " can't attack this way (" + (sourceObject == null ? "null" : sourceObject.getIdName()) + ')');
return false; return false;
} else { } else {
@ -856,9 +857,8 @@ public class Combat implements Serializable, Copyable<Combat> {
// if creature can block more attackers, inform human player or set blocks for AI player // if creature can block more attackers, inform human player or set blocks for AI player
if (mayBlock) { if (mayBlock) {
if (controller.isHuman()) { if (controller.isHuman()) {
if (!game.isSimulation()) { controller.resetPlayerPassedActions();
game.informPlayer(controller, "Creature should block all attackers it's able to this turn: " + creature.getIdName()); game.informPlayer(controller, "Creature should block all attackers it's able to this turn: " + creature.getIdName());
}
} else { } else {
Player defender = game.getPlayer(creature.getControllerId()); Player defender = game.getPlayer(creature.getControllerId());
if (defender != null) { if (defender != null) {
@ -947,9 +947,8 @@ public class Combat implements Serializable, Copyable<Combat> {
// if creature can block, inform human player or set block for AI player // if creature can block, inform human player or set block for AI player
if (mayBlock) { if (mayBlock) {
if (controller.isHuman()) { if (controller.isHuman()) {
if (!game.isSimulation()) { controller.resetPlayerPassedActions();
game.informPlayer(controller, "Creature should block this turn: " + creature.getIdName()); game.informPlayer(controller, "Creature should block this turn: " + creature.getIdName());
}
} else { } else {
Player defender = game.getPlayer(creature.getControllerId()); Player defender = game.getPlayer(creature.getControllerId());
if (defender != null) { if (defender != null) {
@ -1001,6 +1000,7 @@ public class Combat implements Serializable, Copyable<Combat> {
possibleBlockerId, toBeBlockedCreatureId, mustBeBlockedByAtLeastX, game); possibleBlockerId, toBeBlockedCreatureId, mustBeBlockedByAtLeastX, game);
if (blockRequiredMessage != null) { // message means not required if (blockRequiredMessage != null) { // message means not required
removeBlocker(possibleBlockerId, game); removeBlocker(possibleBlockerId, game);
controller.resetPlayerPassedActions();
game.informPlayer(controller, blockRequiredMessage + " Existing block removed. It's a requirement to block " + toBeBlockedCreature.getIdName() + '.'); game.informPlayer(controller, blockRequiredMessage + " Existing block removed. It's a requirement to block " + toBeBlockedCreature.getIdName() + '.');
return false; return false;
} }
@ -1095,7 +1095,8 @@ public class Combat implements Serializable, Copyable<Combat> {
} }
} }
if (sb.length() > 0) { if (sb.length() > 0) {
if (!game.isSimulation()) { if (controller.isHuman()) {
controller.resetPlayerPassedActions();
sb.insert(0, "Some creatures are forced to block certain attacker(s):\n"); sb.insert(0, "Some creatures are forced to block certain attacker(s):\n");
sb.append("\nPlease block with each of these creatures an appropriate attacker."); sb.append("\nPlease block with each of these creatures an appropriate attacker.");
game.informPlayer(controller, sb.toString()); game.informPlayer(controller, sb.toString());
@ -1180,6 +1181,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (Ability ability : entry.getValue()) { for (Ability ability : entry.getValue()) {
if (!effect.canBlockCheckAfter(ability, game, true)) { if (!effect.canBlockCheckAfter(ability, game, true)) {
if (controller.isHuman()) { if (controller.isHuman()) {
controller.resetPlayerPassedActions();
game.informPlayer(controller, blockingCreature.getLogName() + " can't block this way."); game.informPlayer(controller, blockingCreature.getLogName() + " can't block this way.");
return false; return false;
} else { } else {
@ -1200,6 +1202,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (Ability ability : entry.getValue()) { for (Ability ability : entry.getValue()) {
if (!effect.canBeBlockedCheckAfter(attackingCreature, ability, game, true)) { if (!effect.canBeBlockedCheckAfter(attackingCreature, ability, game, true)) {
if (controller.isHuman()) { if (controller.isHuman()) {
controller.resetPlayerPassedActions();
game.informPlayer(controller, attackingCreature.getLogName() + " can't be blocked this way."); game.informPlayer(controller, attackingCreature.getLogName() + " can't be blocked this way.");
return false; return false;
} else { } else {
@ -1340,7 +1343,8 @@ public class Combat implements Serializable, Copyable<Combat> {
} }
if (defenderAttackedBy.size() >= defendingPlayer.getMaxAttackedBy()) { if (defenderAttackedBy.size() >= defendingPlayer.getMaxAttackedBy()) {
Player attackingPlayer = game.getPlayer(game.getControllerId(attackerId)); Player attackingPlayer = game.getPlayer(game.getControllerId(attackerId));
if (attackingPlayer != null && !game.isSimulation()) { if (attackingPlayer != null && attackingPlayer.isHuman()) {
attackingPlayer.resetPlayerPassedActions();
game.informPlayer(attackingPlayer, "No more than " game.informPlayer(attackingPlayer, "No more than "
+ CardUtil.numberToText(defendingPlayer.getMaxAttackedBy()) + CardUtil.numberToText(defendingPlayer.getMaxAttackedBy())
+ " creatures can attack " + " creatures can attack "