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

Merge branch 'Fix-RepeatEach-Changing-Zones' into 'master'

Browse Source 
RepeatSubAbility host isn't set correctly if source changes zone

See merge request core-developers/forge!61
This commit is contained in:
Michael Kamensky
2018-01-09 05:18:46 +00:00
parent 2ae735db74 eeccc8490d
commit ee29d4289c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
View File

@@ -28,11 +28,11 @@ public class RepeatEachEffect extends SpellAbilityEffect {
AbilitySub repeat = sa.getAdditionalAbility("RepeatSubAbility");
if (repeat != null && !repeat.getHostCard().equals(source)) {
if (repeat != null && !repeat.getHostCard().equalsWithTimestamp(source)) {
// TODO: for some reason, the host card of the original additional SA is set to the cloned card when
// the ability is copied (e.g. Clone Legion + Swarm Intelligence). Couldn't figure out why this happens,
// so this hack is necessary for now to work around this issue.
System.out.println("Warning: RepeatSubAbility had the wrong host set (potentially after cloning the root SA), attempting to correct...");
System.out.println("Warning: RepeatSubAbility had the wrong host set (potentially after cloning the root SA or changing zones), attempting to correct...");
repeat.setHostCard(source);
}

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

@@ -4776,6 +4776,9 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void setTimestamp(final long t) {
timestamp = t;
}
public boolean equalsWithTimestamp(Card c) {
return c == this && c.getTimestamp() == timestamp;
}
/**
* Assign a random foil finish depending on the card edition.