github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed possible problem with setting of the spellAbility during card copies (related to eecaa232f5).

Browse source
This commit is contained in:
LevelX2 2020-07-14 23:18:47 +02:00
parent 24098bf8cc
commit aad36dda19
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import mage.MageObject;
import mage.MageObjectImpl;
import mage.Mana;
import mage.ObjectColor;
@ -15,20 +14,13 @@ import mage.abilities.*;
import mage.abilities.hint.Hint;
import mage.abilities.hint.HintUtils;
import mage.abilities.keyword.FlashbackAbility;
import mage.abilities.mana.ActivatedManaAbilityImpl;
import mage.cards.repository.PluginClassloaderRegistery;
import mage.constants.*;
import mage.counters.Counter;
import mage.counters.Counters;
import mage.filter.FilterMana;
import mage.game.*;
import mage.game.command.CommandObject;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
import mage.util.GameLog;
import mage.util.SubTypeList;
import mage.watchers.Watcher;
import org.apache.log4j.Logger;
@ -135,11 +127,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
secondSideCardClazz = card.secondSideCardClazz;
nightCard = card.nightCard;
}
// if (card.spellAbility != null) {
// spellAbility = (SpellAbility) abilities.get(0);
// } else {
spellAbility = null; // will be set on first getSpellAbility call.
// }
spellAbility = null; // will be set on first getSpellAbility call if card has one.
flipCard = card.flipCard;
flipCardName = card.flipCardName;

5
Mage/src/main/java/mage/game/permanent/PermanentCard.java
View file

@ -6,7 +6,6 @@ import javax.lang.model.SourceVersion;
import mage.MageObject;
import mage.abilities.Abilities;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.keyword.TransformAbility;
@ -89,9 +88,7 @@ public class PermanentCard extends PermanentImpl {
}
} else {
this.abilities = card.getAbilities().copy();
if (this.spellAbility != null) {
this.spellAbility = (SpellAbility) this.abilities.get(0);
}
this.spellAbility = null; // will be set on first getSpellAbility call if card has one.
}
// adventure cards must show adventure spell info on battlefield too
/*