external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'goadedFix' into 'master'

Browse Source 
Goad: fixed using PlayerCollection

See merge request core-developers/forge!6077
This commit is contained in:
Bug Hunter
2022-01-24 08:54:54 +00:00
parent 47a2f4b81e d8ab18e673
commit 38d706c883
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
View File

@@ -22,16 +22,12 @@ public class GoadEffect extends SpellAbilityEffect {
continue; continue;
} }
// 701.38d
if (tgtC.isGoadedBy(player)) {
continue;
}
// if pump is a target, make sure we can still target now // if pump is a target, make sure we can still target now
if (sa.usesTargeting() && !sa.getTargetRestrictions().canTgtPlayer() && !tgtC.canBeTargetedBy(sa)) { if (sa.usesTargeting() && !sa.getTargetRestrictions().canTgtPlayer() && !tgtC.canBeTargetedBy(sa)) {
continue; continue;
} }
// 701.38d is handled by getGoaded
tgtC.addGoad(timestamp, player); tgtC.addGoad(timestamp, player);
final GameCommand untilEOT = new GameCommand() { final GameCommand untilEOT = new GameCommand() {

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6593,8 +6593,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return goad.containsValue(p); return goad.containsValue(p);
} }
public final Collection<Player> getGoaded() { public final PlayerCollection getGoaded() {
return goad.values(); return new PlayerCollection(goad.values()); // 701.38d
} }
/** /**

2
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -919,7 +919,7 @@ public final class StaticAbilityContinuous {
} }
if (layer == StaticAbilityLayer.RULES) { if (layer == StaticAbilityLayer.RULES) {
if (params.containsKey("Goad") && !affectedCard.isGoadedBy(hostCard.getController())) { if (params.containsKey("Goad")) {
affectedCard.addGoad(se.getTimestamp(), hostCard.getController()); affectedCard.addGoad(se.getTimestamp(), hostCard.getController());
} }
if (params.containsKey("CanBlockAny")) { if (params.containsKey("CanBlockAny")) {