From 84ec743b075c6d5ba4fcf1c62d3651e4c6c1db26 Mon Sep 17 00:00:00 2001
From: jeffwadsworth <jeff@delmarus.com>
Date: Mon, 8 Jun 2020 17:04:49 -0500
Subject: [PATCH] - Fixed #6599 #6405 #4999 #4270

---
 Mage/src/main/java/mage/game/combat/Combat.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java
index 32d834b1a16..3dff44f3994 100644
--- a/Mage/src/main/java/mage/game/combat/Combat.java
+++ b/Mage/src/main/java/mage/game/combat/Combat.java
@@ -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);