External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
xenohedron 2023-12-03 21:45:06 -05:00
parent 20fd17cadb
commit a27cf20a60
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/h/HeatWave.java
View file

@ -4,8 +4,6 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.PayLifeCost;
import mage.abilities.costs.mana.ManaCostsImpl; 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.ReplacementEffectImpl;
import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.RestrictionEffect;
import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.abilities.keyword.CumulativeUpkeepAbility;
@ -63,7 +61,7 @@ class HeatWaveEffect1 extends RestrictionEffect {
} }
@Override @Override
public ContinuousEffect copy() { public HeatWaveEffect1 copy() {
return new HeatWaveEffect1(this); return new HeatWaveEffect1(this);
} }
@ -125,7 +123,7 @@ class HeatWaveEffect2 extends ReplacementEffectImpl {
} }
@Override @Override
public ReplacementEffect copy() { public HeatWaveEffect2 copy() {
return new HeatWaveEffect2(this); return new HeatWaveEffect2(this);
} }
} }

3
Mage.Sets/src/mage/cards/h/Hipparion.java
View file

@ -5,7 +5,6 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCost;
import mage.abilities.effects.ReplacementEffect;
import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.ReplacementEffectImpl;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -91,7 +90,7 @@ class HipparionEffect extends ReplacementEffectImpl {
} }
@Override @Override
public ReplacementEffect copy() { public HipparionEffect copy() {
return new HipparionEffect(this); return new HipparionEffect(this);
} }
} }