mirror of
https://github.com/magefree/mage.git
synced 2025-12-21 19:11:59 -08:00
merge fix
This commit is contained in:
parent
20fd17cadb
commit
a27cf20a60
2 changed files with 3 additions and 6 deletions
|
|
@ -4,8 +4,6 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.costs.common.PayLifeCost;
|
||||
import mage.abilities.costs.mana.ManaCostsImpl;
|
||||
import mage.abilities.effects.ContinuousEffect;
|
||||
import mage.abilities.effects.ReplacementEffect;
|
||||
import mage.abilities.effects.ReplacementEffectImpl;
|
||||
import mage.abilities.effects.RestrictionEffect;
|
||||
import mage.abilities.keyword.CumulativeUpkeepAbility;
|
||||
|
|
@ -63,7 +61,7 @@ class HeatWaveEffect1 extends RestrictionEffect {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ContinuousEffect copy() {
|
||||
public HeatWaveEffect1 copy() {
|
||||
return new HeatWaveEffect1(this);
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +123,7 @@ class HeatWaveEffect2 extends ReplacementEffectImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ReplacementEffect copy() {
|
||||
public HeatWaveEffect2 copy() {
|
||||
return new HeatWaveEffect2(this);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.costs.mana.GenericManaCost;
|
||||
import mage.abilities.costs.mana.ManaCost;
|
||||
import mage.abilities.effects.ReplacementEffect;
|
||||
import mage.abilities.effects.ReplacementEffectImpl;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
|
|
@ -91,7 +90,7 @@ class HipparionEffect extends ReplacementEffectImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public ReplacementEffect copy() {
|
||||
public HipparionEffect copy() {
|
||||
return new HipparionEffect(this);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue