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

[refactor] removed generic parameter from remaining Abilities

Browse source
This commit is contained in:
North 2014-06-03 12:07:21 +03:00
parent a2e086a152
commit 4fd248c4f8
69 changed files with 73 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/alarareborn/TraceOfAbundance.java
View file

@ -93,7 +93,7 @@ public class TraceOfAbundance extends CardImpl {
}
}
class TraceOfAbundanceTriggeredAbility extends TriggeredManaAbility<TraceOfAbundanceTriggeredAbility> {
class TraceOfAbundanceTriggeredAbility extends TriggeredManaAbility {
public TraceOfAbundanceTriggeredAbility() {
super(Zone.BATTLEFIELD, new TraceOfAbundanceEffect());

2
Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java
View file

@ -71,7 +71,7 @@ public class TreacherousPitDweller extends CardImpl {
}
}
class TreacherousPitDwellerTriggeredAbility extends ZoneChangeTriggeredAbility<TreacherousPitDwellerTriggeredAbility> {
class TreacherousPitDwellerTriggeredAbility extends ZoneChangeTriggeredAbility {
private static final String ruleText = "When {this} enters the battlefield from a graveyard, ";

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java
View file

@ -84,7 +84,7 @@ public class ClashOfRealities extends CardImpl {
return new ClashOfRealities(this);
}
private class ClashOfRealitiesTriggeredAbility extends ZoneChangeTriggeredAbility<ClashOfRealitiesTriggeredAbility> {
private class ClashOfRealitiesTriggeredAbility extends ZoneChangeTriggeredAbility {
public ClashOfRealitiesTriggeredAbility(Effect effect, String rule) {
super(Zone.BATTLEFIELD, effect, rule, true);

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java
View file

@ -82,7 +82,7 @@ public class PetalmaneBaku extends CardImpl {
return new PetalmaneBaku(this);
}
private class PetalmaneBakuManaAbility extends BasicManaAbility<PetalmaneBakuManaAbility> {
private class PetalmaneBakuManaAbility extends BasicManaAbility {
PetalmaneBakuManaAbility() {
super(new PetalmaneBakuManaEffect());
this.addChoice(new ChoiceColor());

2
Mage.Sets/src/mage/sets/bornofthegods/AstralCornucopia.java
View file

@ -109,7 +109,7 @@ class AstralCornucopiaEffect extends OneShotEffect {
}
}
class AstralCornucopiaManaAbility extends ManaAbility<AstralCornucopiaManaAbility> {
class AstralCornucopiaManaAbility extends ManaAbility {
public AstralCornucopiaManaAbility() {
super(Zone.BATTLEFIELD, new AstralCornucopiaManaEffect(), new TapSourceCost());

2
Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java
View file

@ -71,7 +71,7 @@ public class HeartbeatOfSpring extends CardImpl {
}
}
class HeartbeatOfSpringAbility extends TriggeredManaAbility<HeartbeatOfSpringAbility> {
class HeartbeatOfSpringAbility extends TriggeredManaAbility {
private static final String staticText = "Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.";

2
Mage.Sets/src/mage/sets/conflux/KnotvineMystic.java
View file

@ -71,7 +71,7 @@ public class KnotvineMystic extends CardImpl{
}
class KnotvineMysticManaAbility extends BasicManaAbility<KnotvineMysticManaAbility> {
class KnotvineMysticManaAbility extends BasicManaAbility {
public KnotvineMysticManaAbility() {
super(new BasicManaEffect(new Mana(1, 1, 0, 1, 0, 0, 0)));

2
Mage.Sets/src/mage/sets/conflux/QuenchableFire.java
View file

@ -145,7 +145,7 @@ class QuenchableFireDelayedTriggeredAbility extends DelayedTriggeredAbility {
}
class QuenchableFireSpecialAction extends SpecialAction<QuenchableFireSpecialAction> {
class QuenchableFireSpecialAction extends SpecialAction {
public QuenchableFireSpecialAction(UUID effectId) {
this.addCost(new ManaCostsImpl("{U}"));

2
Mage.Sets/src/mage/sets/darksteel/UrGolemsEye.java
View file

@ -60,7 +60,7 @@ public class UrGolemsEye extends CardImpl {
}
class UrGolemsEyeAbility extends BasicManaAbility<UrGolemsEyeAbility> {
class UrGolemsEyeAbility extends BasicManaAbility {
public UrGolemsEyeAbility() {
super(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 2, 0)));

2
Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java
View file

@ -127,7 +127,7 @@ class ChooseColorEffect extends OneShotEffect {
}
class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility<UtopiaSprawlTriggeredAbility> {
class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
public UtopiaSprawlTriggeredAbility() {

2
Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java
View file

@ -78,7 +78,7 @@ public class ZhurTaaAncient extends CardImpl {
}
}
class ZhurTaaAncientAbility extends TriggeredManaAbility<ZhurTaaAncientAbility> {
class ZhurTaaAncientAbility extends TriggeredManaAbility {
private static final String staticText = "Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.";

2
Mage.Sets/src/mage/sets/fallenempires/HighTide.java
View file

@ -74,7 +74,7 @@ public class HighTide extends CardImpl {
}
}
class HighTideTriggeredAbility extends DelayedTriggeredManaAbility<HighTideTriggeredAbility> {
class HighTideTriggeredAbility extends DelayedTriggeredManaAbility {
private static final FilterLandPermanent filter = new FilterLandPermanent("Island");
static {

2
Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java
View file

@ -79,7 +79,7 @@ public class DawnsReflection extends CardImpl {
return new DawnsReflection(this);
}
}
class DawnsReflectionTriggeredAbility extends TriggeredManaAbility<DawnsReflectionTriggeredAbility> {
class DawnsReflectionTriggeredAbility extends TriggeredManaAbility {
public DawnsReflectionTriggeredAbility() {
super(Zone.BATTLEFIELD, new DawnsReflectionManaEffect());

2
Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java
View file

@ -70,7 +70,7 @@ public class Narcomoeba extends CardImpl {
}
class NarcomoebaAbility extends ZoneChangeTriggeredAbility<NarcomoebaAbility> {
class NarcomoebaAbility extends ZoneChangeTriggeredAbility {
public NarcomoebaAbility() {
super(Zone.LIBRARY, Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), "", true);
this.zone = Zone.ALL;

2
Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java
View file

@ -75,7 +75,7 @@ public class CryptGhast extends CardImpl {
}
}
class CryptGhastTriggeredAbility extends TriggeredManaAbility<CryptGhastTriggeredAbility> {
class CryptGhastTriggeredAbility extends TriggeredManaAbility {
private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp");
static {

2
Mage.Sets/src/mage/sets/gatecrash/VerdantHaven.java
View file

@ -87,7 +87,7 @@ public class VerdantHaven extends CardImpl {
}
}
class VerdantHavenTriggeredAbility extends TriggeredManaAbility<VerdantHavenTriggeredAbility> {
class VerdantHavenTriggeredAbility extends TriggeredManaAbility {
public VerdantHavenTriggeredAbility() {
super(Zone.BATTLEFIELD, new VerdantHavenManaEffect());

2
Mage.Sets/src/mage/sets/iceage/WildGrowth.java
View file

@ -80,7 +80,7 @@ public class WildGrowth extends CardImpl {
}
}
class WildGrowthTriggeredAbility extends TriggeredManaAbility<WildGrowthTriggeredAbility> {
class WildGrowthTriggeredAbility extends TriggeredManaAbility {
public WildGrowthTriggeredAbility() {

2
Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java
View file

@ -81,7 +81,7 @@ public class MarketFestival extends CardImpl {
}
}
class MarketFestivalTriggeredAbility extends TriggeredManaAbility<MarketFestivalTriggeredAbility> {
class MarketFestivalTriggeredAbility extends TriggeredManaAbility {
public MarketFestivalTriggeredAbility() {
super(Zone.BATTLEFIELD, new MarketFestivalManaEffect());

2
Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java
View file

@ -89,7 +89,7 @@ public class MistbindClique extends CardImpl {
}
}
class MistbindCliqueAbility extends ZoneChangeTriggeredAbility<MistbindCliqueAbility> {
class MistbindCliqueAbility extends ZoneChangeTriggeredAbility {
public MistbindCliqueAbility() {
super(Zone.BATTLEFIELD, Zone.EXILED, new MistbindCliqueTapEffect(), "When a Faerie is championed with {this}, ", false);

2
Mage.Sets/src/mage/sets/mercadianmasques/KyrenToy.java
View file

@ -77,7 +77,7 @@ public class KyrenToy extends CardImpl {
return new KyrenToy(this);
}
private class KyrenToyManaAbility extends BasicManaAbility<KyrenToyManaAbility> {
private class KyrenToyManaAbility extends BasicManaAbility {
KyrenToyManaAbility() {
super(new KyrenToyManaEffect());
}

2
Mage.Sets/src/mage/sets/mirage/LionsEyeDiamond.java
View file

@ -67,7 +67,7 @@ public class LionsEyeDiamond extends CardImpl {
}
class LionsEyeDiamondAbility extends ManaAbility<LionsEyeDiamondAbility> {
class LionsEyeDiamondAbility extends ManaAbility {
public LionsEyeDiamondAbility() {
super(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new SacrificeSourceCost());

2
Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java
View file

@ -153,7 +153,7 @@ class CagedSunEffect2 extends ContinuousEffectImpl {
}
class CagedSunTriggeredAbility extends TriggeredManaAbility<CagedSunTriggeredAbility> {
class CagedSunTriggeredAbility extends TriggeredManaAbility {
private static final String staticText = "Whenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool.";

2
Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java
View file

@ -77,7 +77,7 @@ public class CathedralMembrane extends CardImpl {
}
}
class CathedralMembraneAbility extends ZoneChangeTriggeredAbility<CathedralMembraneAbility> {
class CathedralMembraneAbility extends ZoneChangeTriggeredAbility {
public CathedralMembraneAbility() {
super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new CathedralMembraneEffect(), "When {this} dies during combat, ", false);

2
Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
View file

@ -84,7 +84,7 @@ public class VorinclexVoiceOfHunger extends CardImpl {
}
}
class VorinclexTriggeredAbility1 extends TriggeredManaAbility<VorinclexTriggeredAbility1> {
class VorinclexTriggeredAbility1 extends TriggeredManaAbility {
private static final String staticText = "Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.";

2
Mage.Sets/src/mage/sets/planechase/VedalkenEngineer.java
View file

@ -110,7 +110,7 @@ class VedalkenEngineerManaCondition implements Condition {
}
}
class VedalkenEngineerAbility extends ManaAbility<VedalkenEngineerAbility> {
class VedalkenEngineerAbility extends ManaAbility {
public VedalkenEngineerAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder) {
super(Zone.BATTLEFIELD, new VedalkenEngineerEffect(amount, manaBuilder), cost);

2
Mage.Sets/src/mage/sets/returntoravnica/AngelOfSerenity.java
View file

@ -88,7 +88,7 @@ public class AngelOfSerenity extends CardImpl {
}
}
class AngelOfSerenityTriggeredAbility extends ZoneChangeTriggeredAbility<AngelOfSerenityTriggeredAbility> {
class AngelOfSerenityTriggeredAbility extends ZoneChangeTriggeredAbility {
public AngelOfSerenityTriggeredAbility() {
super(Zone.BATTLEFIELD, new AngelOfSerenityEnterEffect(), "When {this} enters the battlefield, ", true);

2
Mage.Sets/src/mage/sets/revisededition/SolRing.java
View file

@ -58,7 +58,7 @@ public class SolRing extends CardImpl {
}
}
class SolRingAbility extends BasicManaAbility<SolRingAbility> {
class SolRingAbility extends BasicManaAbility {
public SolRingAbility() {
super(new BasicManaEffect(Mana.ColorlessMana(2)));

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/DreamstoneHedron.java
View file

@ -69,7 +69,7 @@ public class DreamstoneHedron extends CardImpl {
return new DreamstoneHedron(this);
}
class DreamstoneHedronFirstManaAbility extends BasicManaAbility<DreamstoneHedronFirstManaAbility> {
class DreamstoneHedronFirstManaAbility extends BasicManaAbility {
public DreamstoneHedronFirstManaAbility() {
super(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 3, 0)));

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziTemple.java
View file

@ -66,7 +66,7 @@ public class EldraziTemple extends CardImpl {
}
}
class EldraziTempleManaAbility extends BasicManaAbility<EldraziTempleManaAbility> {
class EldraziTempleManaAbility extends BasicManaAbility {
EldraziTempleManaAbility ( ) {
super(new BasicManaEffect(new EldraziConditionalMana()));

2
Mage.Sets/src/mage/sets/riseoftheeldrazi/MulDayaChannelers.java
View file

@ -98,7 +98,7 @@ public class MulDayaChannelers extends CardImpl {
}
class MulDayaChannelersActivateIfConditionManaAbility extends ManaAbility<MulDayaChannelersActivateIfConditionManaAbility> {
class MulDayaChannelersActivateIfConditionManaAbility extends ManaAbility {
private Condition condition;

2
Mage.Sets/src/mage/sets/scarsofmirrodin/GrandArchitect.java
View file

@ -137,7 +137,7 @@ class GrandArchitectEffect extends ContinuousEffectImpl {
}
class GrandArchitectManaAbility extends ManaAbility<GrandArchitectManaAbility> {
class GrandArchitectManaAbility extends ManaAbility {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped blue creature");

2
Mage.Sets/src/mage/sets/scarsofmirrodin/MyrReservoir.java
View file

@ -84,7 +84,7 @@ public class MyrReservoir extends CardImpl {
}
}
class MyrReservoirManaAbility extends BasicManaAbility<MyrReservoirManaAbility> {
class MyrReservoirManaAbility extends BasicManaAbility {
MyrReservoirManaAbility() {
super(new BasicManaEffect(new MyrConditionalMana()));

2
Mage.Sets/src/mage/sets/scarsofmirrodin/PalladiumMyr.java
View file

@ -63,7 +63,7 @@ public class PalladiumMyr extends CardImpl {
}
}
class PalladiumMyrAbility extends BasicManaAbility<PalladiumMyrAbility> {
class PalladiumMyrAbility extends BasicManaAbility {
public PalladiumMyrAbility() {
super(new BasicManaEffect(Mana.ColorlessMana(2)));

2
Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java
View file

@ -77,7 +77,7 @@ public class KeeperOfProgenitus extends CardImpl {
}
}
class HeartbeatOfSpringAbility extends TriggeredManaAbility<HeartbeatOfSpringAbility> {
class HeartbeatOfSpringAbility extends TriggeredManaAbility {
private static final String staticText = "Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to his or her mana pool of any type that land produced.";

2
Mage.Sets/src/mage/sets/shardsofalara/KnightOfTheWhiteOrchid.java
View file

@ -74,7 +74,7 @@ public class KnightOfTheWhiteOrchid extends CardImpl {
}
class KnightOfTheWhiteOrchidAbility extends ZoneChangeTriggeredAbility<KnightOfTheWhiteOrchidAbility> {
class KnightOfTheWhiteOrchidAbility extends ZoneChangeTriggeredAbility {
private static final FilterCard filter1 = new FilterCard("Plains");
private static final FilterLandPermanent filter2 = new FilterLandPermanent();

2
Mage.Sets/src/mage/sets/stronghold/Overgrowth.java
View file

@ -80,7 +80,7 @@ public class Overgrowth extends CardImpl {
}
}
class OvergrowthTriggeredAbility extends TriggeredManaAbility<OvergrowthTriggeredAbility> {
class OvergrowthTriggeredAbility extends TriggeredManaAbility {
public OvergrowthTriggeredAbility() {

2
Mage.Sets/src/mage/sets/tempest/MongrelPack.java
View file

@ -70,7 +70,7 @@ public class MongrelPack extends CardImpl {
}
}
class MongrelPackAbility extends ZoneChangeTriggeredAbility<MongrelPackAbility> {
class MongrelPackAbility extends ZoneChangeTriggeredAbility {
public MongrelPackAbility() {
super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new CreateTokenEffect(new HoundToken(), 4), "When {this} dies during combat, ", false);

2
Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java
View file

@ -76,7 +76,7 @@ public class NykthosShrineToNyx extends CardImpl {
}
}
class NykthosShrineToNyxManaAbility extends ManaAbility<NykthosShrineToNyxManaAbility> {
class NykthosShrineToNyxManaAbility extends ManaAbility {
public NykthosShrineToNyxManaAbility() {
super(Zone.BATTLEFIELD, new NykthosDynamicManaEffect(), new GenericManaCost(2));

2
Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java
View file

@ -148,7 +148,7 @@ class GaeasBlessingTarget extends TargetCard {
}
}
class GaeasBlessingTriggeredAbility extends ZoneChangeTriggeredAbility<GaeasBlessingTriggeredAbility> {
class GaeasBlessingTriggeredAbility extends ZoneChangeTriggeredAbility {
public GaeasBlessingTriggeredAbility() {
super(Zone.LIBRARY, Zone.GRAVEYARD, new GaeasBlessingGraveToLibraryEffect(), "", false);
this.zone = Zone.ALL;

2
Mage.Sets/src/mage/sets/urzassaga/FertileGround.java
View file

@ -78,7 +78,7 @@ public class FertileGround extends CardImpl {
}
}
class FertileGroundTriggeredAbility extends TriggeredManaAbility<FertileGroundTriggeredAbility> {
class FertileGroundTriggeredAbility extends TriggeredManaAbility {
public FertileGroundTriggeredAbility() {

2
Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java
View file

@ -72,7 +72,7 @@ public class VernalBloom extends CardImpl {
}
}
class VernalBloomTriggeredAbility extends TriggeredManaAbility<VernalBloomTriggeredAbility> {
class VernalBloomTriggeredAbility extends TriggeredManaAbility {
private static final FilterLandPermanent filter = new FilterLandPermanent("Forest");
static {

2
Mage.Sets/src/mage/sets/urzassaga/WornPowerstone.java
View file

@ -60,7 +60,7 @@ public class WornPowerstone extends CardImpl {
}
}
class WornPowerstoneAbility extends BasicManaAbility<WornPowerstoneAbility> {
class WornPowerstoneAbility extends BasicManaAbility {
public WornPowerstoneAbility() {
super(new BasicManaEffect(Mana.ColorlessMana(2)));

2
Mage.Sets/src/mage/sets/worldwake/HarabazDruid.java
View file

@ -73,7 +73,7 @@ public class HarabazDruid extends CardImpl {
}
}
class HarabazDruidManaAbility extends BasicManaAbility<HarabazDruidManaAbility> {
class HarabazDruidManaAbility extends BasicManaAbility {
HarabazDruidManaAbility() {
super(new HarabazDruidManaEffect());
this.addChoice(new ChoiceColor());

3
Mage/src/mage/abilities/SpecialAction.java
View file

@ -34,9 +34,8 @@ import mage.constants.Zone;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public abstract class SpecialAction<T extends SpecialAction<T>> extends ActivatedAbilityImpl {
public abstract class SpecialAction extends ActivatedAbilityImpl {
public SpecialAction() {
super(AbilityType.SPECIAL_ACTION, Zone.ALL);

2
Mage/src/mage/abilities/common/CycleTriggeredAbility.java
View file

@ -40,7 +40,7 @@ import mage.game.stack.StackObject;
*
* @author Plopman
*/
public class CycleTriggeredAbility extends ZoneChangeTriggeredAbility<CycleTriggeredAbility> {
public class CycleTriggeredAbility extends ZoneChangeTriggeredAbility {
public CycleTriggeredAbility(Effect effect, boolean optional) {
super(Zone.ALL, effect, "When you cycle {this}, ", optional);

2
Mage/src/mage/abilities/common/DiesTriggeredAbility.java
View file

@ -37,7 +37,7 @@ import mage.game.Game;
*
* @author BetaSteward_at_googlemail.com
*/
public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility<DiesTriggeredAbility> {
public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility {
public DiesTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional);

2
Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java
View file

@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
*
* @author noxx
*/
public class EntersAnotherCreatureYourControlTriggeredAbility extends ZoneChangeTriggeredAbility<EntersAnotherCreatureYourControlTriggeredAbility> {
public class EntersAnotherCreatureYourControlTriggeredAbility extends ZoneChangeTriggeredAbility {
public EntersAnotherCreatureYourControlTriggeredAbility(Effect effect) {
this(effect, false);

2
Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.Effect;
*
* @author BetaSteward_at_googlemail.com
*/
public class LeavesBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility<LeavesBattlefieldTriggeredAbility> {
public class LeavesBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility {
public LeavesBattlefieldTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, null, effect, "When {this} leaves the battlefield, ", optional);

2
Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereTriggeredAbility.java
View file

@ -6,7 +6,7 @@ import mage.constants.Zone;
/**
* @author Loki
*/
public class PutIntoGraveFromAnywhereTriggeredAbility extends ZoneChangeTriggeredAbility<PutIntoGraveFromAnywhereTriggeredAbility> {
public class PutIntoGraveFromAnywhereTriggeredAbility extends ZoneChangeTriggeredAbility {
public PutIntoGraveFromAnywhereTriggeredAbility(Effect effect, boolean optional) {
super(Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from anywhere, ", optional);
}

2
Mage/src/mage/abilities/common/TapLandForManaAllTriggeredManaAbility.java
View file

@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
*
* @author LevelX2
*/
public class TapLandForManaAllTriggeredManaAbility extends TriggeredManaAbility<TapLandForManaAllTriggeredManaAbility> {
public class TapLandForManaAllTriggeredManaAbility extends TriggeredManaAbility {
private final boolean setTargetPointer;

6
Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
View file

@ -43,7 +43,7 @@ import mage.game.permanent.Permanent;
*
* @author LevelX2
*/
public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbility<T>> extends TriggeredAbilityImpl {
public class ZoneChangeAllTriggeredAbility extends TriggeredAbilityImpl {
protected FilterPermanent filter;
protected Zone fromZone;
@ -95,8 +95,8 @@ public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbili
}
@Override
public T copy() {
return (T)new ZoneChangeAllTriggeredAbility(this);
public ZoneChangeAllTriggeredAbility copy() {
return new ZoneChangeAllTriggeredAbility(this);
}
public Zone getFromZone() {

7
Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java
View file

@ -41,9 +41,8 @@ import mage.game.permanent.Permanent;
* Is applied when the {@link Permanent} with this ability instance changes zones.
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>> extends TriggeredAbilityImpl {
public class ZoneChangeTriggeredAbility extends TriggeredAbilityImpl {
protected Zone fromZone;
protected Zone toZone;
@ -87,8 +86,8 @@ public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>>
}
@Override
public T copy() {
return (T)new ZoneChangeTriggeredAbility(this);
public ZoneChangeTriggeredAbility copy() {
return new ZoneChangeTriggeredAbility(this);
}
public Zone getFromZone() {

2
Mage/src/mage/abilities/keyword/HauntAbility.java
View file

@ -119,7 +119,7 @@ public class HauntAbility extends TriggeredAbilityImpl {
}
}
class HauntExileAbility extends ZoneChangeTriggeredAbility<HauntExileAbility> {
class HauntExileAbility extends ZoneChangeTriggeredAbility {
private final static String RULE_TEXT_CREATURE = "Haunt <i>(When this creature dies, exile it haunting target creature.)</i>";
public HauntExileAbility() {

2
Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java
View file

@ -41,7 +41,7 @@ import mage.game.Game;
*/
public class ActivateIfConditionManaAbility extends ManaAbility<ActivateIfConditionManaAbility> {
public class ActivateIfConditionManaAbility extends ManaAbility {
private Condition condition;

2
Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java
View file

@ -38,7 +38,7 @@ import mage.game.Game;
*
* @author LevelX2
*/
public class ActivateOncePerTurnManaAbility extends ManaAbility<ActivateOncePerTurnManaAbility> {
public class ActivateOncePerTurnManaAbility extends ManaAbility {
public ActivateOncePerTurnManaAbility(Zone zone, ManaEffect effect, Cost cost) {
super(zone, effect, cost);

2
Mage/src/mage/abilities/mana/AnyColorManaAbility.java
View file

@ -33,7 +33,7 @@ import mage.abilities.effects.common.AddManaOfAnyColorEffect;
import mage.choices.ChoiceColor;
import mage.constants.Zone;
public class AnyColorManaAbility extends ManaAbility<AnyColorManaAbility> {
public class AnyColorManaAbility extends ManaAbility {
public AnyColorManaAbility() {
this(new TapSourceCost());
}

3
Mage/src/mage/abilities/mana/BasicManaAbility.java
View file

@ -35,9 +35,8 @@ import mage.abilities.effects.common.ManaEffect;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public abstract class BasicManaAbility<T extends BasicManaAbility<T>> extends ManaAbility<T> {
public abstract class BasicManaAbility extends ManaAbility {
public BasicManaAbility(ManaEffect effect) {
super(Zone.BATTLEFIELD, effect, new TapSourceCost());

2
Mage/src/mage/abilities/mana/BlackManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class BlackManaAbility extends BasicManaAbility<BlackManaAbility> {
public class BlackManaAbility extends BasicManaAbility {
public BlackManaAbility() {
super(new BasicManaEffect(Mana.BlackMana));

2
Mage/src/mage/abilities/mana/BlueManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class BlueManaAbility extends BasicManaAbility<BlueManaAbility> {
public class BlueManaAbility extends BasicManaAbility {
public BlueManaAbility() {
super(new BasicManaEffect(Mana.BlueMana));

2
Mage/src/mage/abilities/mana/ColorlessManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class ColorlessManaAbility extends BasicManaAbility<ColorlessManaAbility> {
public class ColorlessManaAbility extends BasicManaAbility {
public ColorlessManaAbility() {
super(new BasicManaEffect(Mana.ColorlessMana));

2
Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
View file

@ -40,7 +40,7 @@ import mage.constants.Zone;
*
* @author noxx
*/
public class ConditionalAnyColorManaAbility extends ManaAbility<ConditionalAnyColorManaAbility> {
public class ConditionalAnyColorManaAbility extends ManaAbility {
public ConditionalAnyColorManaAbility(int amount, ConditionalManaBuilder manaBuilder) {
this(new TapSourceCost(), amount, manaBuilder);

2
Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java
View file

@ -37,7 +37,7 @@ import mage.constants.Duration;
/**
* @author Plopman
*/
public abstract class DelayedTriggeredManaAbility<T extends DelayedTriggeredManaAbility<T>> extends DelayedTriggeredAbility {
public abstract class DelayedTriggeredManaAbility extends DelayedTriggeredAbility {
public DelayedTriggeredManaAbility(Zone zone, ManaEffect effect) {
super(effect);

2
Mage/src/mage/abilities/mana/DynamicManaAbility.java
View file

@ -39,7 +39,7 @@ import mage.game.Game;
*
* @author North
*/
public class DynamicManaAbility extends ManaAbility<DynamicManaAbility> {
public class DynamicManaAbility extends ManaAbility {
private DynamicManaEffect manaEffect;
private String rule;

2
Mage/src/mage/abilities/mana/GreenManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class GreenManaAbility extends BasicManaAbility<GreenManaAbility> {
public class GreenManaAbility extends BasicManaAbility {
public GreenManaAbility() {
super(new BasicManaEffect(Mana.GreenMana));

3
Mage/src/mage/abilities/mana/ManaAbility.java
View file

@ -41,9 +41,8 @@ import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public abstract class ManaAbility<T extends ManaAbility<T>> extends ActivatedAbilityImpl {
public abstract class ManaAbility extends ActivatedAbilityImpl {
protected Mana netMana = new Mana();

2
Mage/src/mage/abilities/mana/RedManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class RedManaAbility extends BasicManaAbility<RedManaAbility> {
public class RedManaAbility extends BasicManaAbility {
public RedManaAbility() {
super(new BasicManaEffect(Mana.RedMana));

2
Mage/src/mage/abilities/mana/SimpleManaAbility.java
View file

@ -38,7 +38,7 @@ import mage.abilities.effects.common.ManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class SimpleManaAbility extends ManaAbility<SimpleManaAbility> {
public class SimpleManaAbility extends ManaAbility {
public SimpleManaAbility(Zone zone, ManaEffect effect, Cost cost) {
super(zone, effect, cost);

2
Mage/src/mage/abilities/mana/TriggeredManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.ManaEffect;
* see 20110715 - 605.1b
* @author BetaSteward_at_googlemail.com
*/
public abstract class TriggeredManaAbility<T extends TriggeredManaAbility<T>> extends TriggeredAbilityImpl {
public abstract class TriggeredManaAbility extends TriggeredAbilityImpl {
public TriggeredManaAbility(Zone zone, ManaEffect effect) {
this(zone, effect, false);

2
Mage/src/mage/abilities/mana/WhiteManaAbility.java
View file

@ -35,7 +35,7 @@ import mage.abilities.effects.common.BasicManaEffect;
*
* @author BetaSteward_at_googlemail.com
*/
public class WhiteManaAbility extends BasicManaAbility<WhiteManaAbility> {
public class WhiteManaAbility extends BasicManaAbility {
public WhiteManaAbility() {
super(new BasicManaEffect(Mana.WhiteMana));