github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed #6599 #6405 #4999 #4270

Browse source
This commit is contained in:
jeffwadsworth 2020-06-08 17:04:49 -05:00
parent 0bdbd36d2d
commit 84ec743b07
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -433,7 +433,8 @@ public class Combat implements Serializable, Copyable<Combat> {
// check if a creature has to attack
for (Map.Entry<RequirementEffect, Set<Ability>> entry : game.getContinuousEffects().getApplicableRequirementEffects(creature, false, game).entrySet()) {
RequirementEffect effect = entry.getKey();
if (effect.mustAttack(game)) {
if (effect.mustAttack(game)
&& checkAttackRestrictions(player, game)) { // needed for Goad Effect
mustAttack = true;
for (Ability ability : entry.getValue()) {
UUID defenderId = effect.mustAttackDefender(ability, game);