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

- Added check for copied spells before attempting to put Instant/Sorceries into the graveyard. (Should fix NPE in Stormed Spells)

Browse Source
This commit is contained in:
jendave
2011-08-06 16:45:22 +00:00
parent a1ebd5c113
commit 760c5c9a83
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/CardFactory.java
View File

@@ -5759,7 +5759,7 @@ public class CardFactory implements NewConstants {
//*************** START *********** START **************************
else if(cardName.equals("Volrath's Dungeon")) {
Ability_Cost dungeonCost = new Ability_Cost("Discard<1/Any>", cardName, true);
Ability_Cost dungeonCost = new Ability_Cost("Discard<1/Card>", cardName, true);
Target dungeonTgt = new Target("Volrath's Dungeon - Target player" , "player".split(","));
final SpellAbility dungeon = new Ability_Activated(card, dungeonCost, dungeonTgt){

4
src/forge/CardFactory_Creatures.java
View File

@@ -5046,7 +5046,7 @@ public class CardFactory_Creatures {
//*************** START *********** START **************************
else if(cardName.equals("Goldmeadow Lookout")) {
final Ability_Cost lookCost = new Ability_Cost("W T Discard<1/Any>", card.getName(), true);
final Ability_Cost lookCost = new Ability_Cost("W T Discard<1/Card>", card.getName(), true);
final SpellAbility ability = new Ability_Activated(card, lookCost, null){
private static final long serialVersionUID = -8413409735529340094L;
@@ -10470,7 +10470,7 @@ public class CardFactory_Creatures {
}
};
final Ability_Cost abCost = new Ability_Cost("Discard<2/Any>", cardName, true);
final Ability_Cost abCost = new Ability_Cost("Discard<2/Card>", cardName, true);
final Ability_Activated toExile = new Ability_Activated(card, abCost, null) {
private static final long serialVersionUID = 7850843970664800204L;

2
src/forge/MagicStack.java
View File

@@ -699,7 +699,7 @@ public class MagicStack extends MyObservable {
{} // don't send to graveyard if the spell is using an ability
// If Spell and still on the Stack then let it goto the graveyard or replace its own movement
else if ((source.isInstant() || source.isSorcery()) &&
else if (!source.isCopiedSpell() && (source.isInstant() || source.isSorcery()) &&
AllZone.getZone(source).is(Constant.Zone.Stack)){
if (source.getReplaceMoveToGraveyard().size() == 0)
AllZone.GameAction.moveToGraveyard(source);