From d8ab18e67359f76720c858dd930099d6eb102e14 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Mon, 24 Jan 2022 06:52:19 +0100
Subject: [PATCH] Goad: fixed using PlayerCollection

---
 .../main/java/forge/game/ability/effects/GoadEffect.java    | 6 +-----
 forge-game/src/main/java/forge/game/card/Card.java          | 4 ++--
 .../forge/game/staticability/StaticAbilityContinuous.java   | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
index 3bd6edd41d0..8e771b41b26 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
@@ -22,16 +22,12 @@ public class GoadEffect extends SpellAbilityEffect {
                 continue;
             }
 
-            // 701.38d
-            if (tgtC.isGoadedBy(player)) {
-                continue;
-            }
-
             // if pump is a target, make sure we can still target now
             if (sa.usesTargeting() && !sa.getTargetRestrictions().canTgtPlayer() && !tgtC.canBeTargetedBy(sa)) {
                 continue;
             }
 
+            // 701.38d is handled by getGoaded
             tgtC.addGoad(timestamp, player);
 
             final GameCommand untilEOT = new GameCommand() {
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 675147d14b2..a92bfa71d63 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6593,8 +6593,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         return goad.containsValue(p);
     }
 
-    public final Collection<Player> getGoaded() {
-        return goad.values();
+    public final PlayerCollection getGoaded() {
+        return new PlayerCollection(goad.values()); // 701.38d
     }
 
     /**
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index b1a39885c8d..62dfd5e99d6 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -919,7 +919,7 @@ public final class StaticAbilityContinuous {
             }
 
             if (layer == StaticAbilityLayer.RULES) {
-                if (params.containsKey("Goad") && !affectedCard.isGoadedBy(hostCard.getController())) {
+                if (params.containsKey("Goad")) {
                     affectedCard.addGoad(se.getTimestamp(), hostCard.getController());
                 }
                 if (params.containsKey("CanBlockAny")) {