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

MeldEffect: some fixes

Browse Source
This commit is contained in:
Hanmac
2019-02-03 16:37:49 +01:00
parent b5d97dc256
commit 903c708e1f
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -606,6 +606,13 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (remember != null) { if (remember != null) {
hostCard.addRemembered(movedCard); hostCard.addRemembered(movedCard);
// addRememberedFromCardState ?
if (tgtC.getMeldedWith() != null) {
Card meld = game.getCardState(tgtC.getMeldedWith(), null);
if (meld != null) {
hostCard.addRemembered(meld);
}
}
} }
if (forget != null) { if (forget != null) {
hostCard.removeRemembered(movedCard); hostCard.removeRemembered(movedCard);
@@ -1121,6 +1128,13 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (remember) { if (remember) {
source.addRemembered(movedCard); source.addRemembered(movedCard);
// addRememberedFromCardState ?
if (c.getMeldedWith() != null) {
Card meld = game.getCardState(c.getMeldedWith(), null);
if (meld != null) {
source.addRemembered(meld);
}
}
} }
if (forget) { if (forget) {
source.removeRemembered(movedCard); source.removeRemembered(movedCard);

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

@@ -54,9 +54,9 @@ public class MeldEffect extends SpellAbilityEffect {
} }
primary.changeToState(CardStateName.Meld); primary.changeToState(CardStateName.Meld);
primary.setMeldedWith(secondary);
PlayerZoneBattlefield bf = (PlayerZoneBattlefield)controller.getZone(ZoneType.Battlefield); PlayerZoneBattlefield bf = (PlayerZoneBattlefield)controller.getZone(ZoneType.Battlefield);
Card melded = game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa); game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa);
bf.addToMelded(secondary); bf.addToMelded(secondary);
melded.setMeldedWith(secondary);
} }
} }