External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor formatting.

Browse source
This commit is contained in:
LevelX2 2014-05-14 16:14:09 +02:00
parent 80a3299bf4
commit d89970afde
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/StaticAbility.java
View file

@ -50,7 +50,7 @@ public abstract class StaticAbility<T extends StaticAbility<T>> extends AbilityI
}
}
public StaticAbility(StaticAbility ability) {
public StaticAbility(StaticAbility<T> ability) {
super(ability);
}
}

14
Mage/src/mage/abilities/keyword/LevelerCardBuilder.java
View file

@ -63,7 +63,7 @@ public class LevelerCardBuilder {
private int toughness;
private String rule = "";
private Abilities<Ability> abilities = new AbilitiesImpl<Ability>();
private Abilities<Ability> abilities = new AbilitiesImpl<>();
/**
* Main method constructing ability.
@ -71,7 +71,7 @@ public class LevelerCardBuilder {
* @return
*/
public List<Ability> build() {
List<Ability> constructed = new ArrayList<Ability>();
List<Ability> constructed = new ArrayList<>();
Condition condition = new SourceHasCounterCondition(CounterType.LEVEL, level1, level2);
for (Ability ability : abilities) {
@ -173,12 +173,12 @@ public class LevelerCardBuilder {
public static class LevelAbility {
private int level1;
private int level2;
private int power;
private int toughness;
private final int level1;
private final int level2;
private final int power;
private final int toughness;
private Abilities<Ability> abilities = new AbilitiesImpl<Ability>();
private Abilities<Ability> abilities = new AbilitiesImpl<>();
public LevelAbility(int level1, int level2, Abilities<Ability> abilities, int power, int toughness) {
this.level1 = level1;

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

@ -129,7 +129,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
cardNumber = card.cardNumber;
expansionSetCode = card.expansionSetCode;
rarity = card.rarity;
for (Watcher watcher: (List<Watcher>)card.watchers) {
for (Watcher watcher: (List<Watcher>)card.getWatchers()) {
watchers.add(watcher.copy());
}
faceDown = card.faceDown;
@ -276,7 +276,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
@Override
public List<Mana> getMana() {
List<Mana> mana = new ArrayList<Mana>();
List<Mana> mana = new ArrayList<>();
for (ManaAbility ability : this.abilities.getManaAbilities(Zone.BATTLEFIELD)) {
mana.add(ability.getNetMana(null));
}