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

- FRF: Added Soulfire Grand Master

Browse Source
This commit is contained in:
swordshine
2015-01-09 04:21:01 +00:00
parent cf718c48fa
commit ed2bfcc295
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -544,11 +544,13 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
private final void removeCardFromStack(final SpellAbility sa, final boolean fizzle) {
Card source = sa.getHostCard();
if (sa.getHostCard().isCopiedSpell() || sa.isAbility()) {
if (source.isCopiedSpell() || sa.isAbility()) {
// do nothing
}
else if (sa.isBuyBackAbility() && !fizzle) {
else if ((source.hasKeyword("Move CARDNAME to your hand as it resolves") || sa.isBuyBackAbility()) && !fizzle) {
// Handle cards that need to be moved differently
// TODO: replacement effects: Rebound, Buyback and Soulfire Grand Master
source.removeAllExtrinsicKeyword("Move CARDNAME to your hand as it resolves");
game.getAction().moveToHand(source);
}
else if (sa.isFlashBackAbility()) {