Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge origin/master

Browse source
This commit is contained in:
fireshoes 2015-09-07 12:53:52 -05:00
commit 26a96f8bc2
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/magic2012/SwiftfootBoots.java
View file

@ -58,6 +58,7 @@ public class SwiftfootBoots extends CardImpl {
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT));
Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and haste");
ability.addEffect(effect);
this.addAbility(ability);
// Equip {1}

8
Mage/src/mage/cards/CardImpl.java
View file

@ -296,11 +296,9 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
public SpellAbility getSpellAbility() {
if (spellAbility == null) {
for (Ability ability : abilities.getActivatedAbilities(Zone.HAND)) {
// name check prevents that alternate casting methods (like "cast [card name] using bestow") are returned here
// BUG #1024: Bestow bug
//if (ability instanceof SpellAbility && ability.toString().endsWith(getName())) {
if (ability instanceof SpellAbility) {
spellAbility = (SpellAbility) ability;
if (ability instanceof SpellAbility
&& !((SpellAbility) ability).getSpellAbilityType().equals(SpellAbilityType.BASE_ALTERNATE)) {
return spellAbility = (SpellAbility) ability;
}
}
}