external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
drdev
2013-12-02 07:31:12 +00:00
parent 93b6ac15dd
commit fe04d56568
1 changed files with 132 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-gui/src/main/java/forge/game/card/Card.java
View File

@@ -2981,7 +2981,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.changeControllerCommandList.add(c); this.changeControllerCommandList.add(c);
} }
public final void runChangeControllerCommands() { public final void runChangeControllerCommands() {
for (final Command c : this.changeControllerCommandList) { for (final Command c : this.changeControllerCommandList) {
c.run(); c.run();
@@ -3040,7 +3039,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.becameTargetThisTurn = becameTargetThisTurn; this.becameTargetThisTurn = becameTargetThisTurn;
} }
/** /**
* @return the startedTheTurnUntapped * @return the startedTheTurnUntapped
*/ */
@@ -3055,7 +3053,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.startedTheTurnUntapped = untapped; this.startedTheTurnUntapped = untapped;
} }
/** /**
* <p> * <p>
* Getter for the field <code>owner</code>. * Getter for the field <code>owner</code>.
@@ -3096,7 +3093,6 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void clearTempControllers() { public final void clearTempControllers() {
this.tempControllers.clear(); this.tempControllers.clear();
} }
public final void clearControllers() { public final void clearControllers() {
@@ -3369,8 +3365,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param c * @param c
* a {@link forge.game.card.Card} object. * a {@link forge.game.card.Card} object.
*/ */
public final void unEquipCard(final Card c) // equipment.unEquipCard(equippedCard); public final void unEquipCard(final Card c) { // equipment.unEquipCard(equippedCard);
{
this.equipping.remove(c); this.equipping.remove(c);
c.equippedBy.remove(this); c.equippedBy.remove(this);
@@ -3636,7 +3631,6 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
return newType; return newType;
} }
/** /**
@@ -4688,14 +4682,11 @@ public class Card extends GameEntity implements Comparable<Card> {
public final boolean isFortification() { return this.typeContains("Fortification"); } public final boolean isFortification() { return this.typeContains("Fortification"); }
public final boolean isScheme() { return this.typeContains("Scheme"); } public final boolean isScheme() { return this.typeContains("Scheme"); }
public final boolean isPlaneswalker() { return this.typeContains("Planeswalker"); } public final boolean isPlaneswalker() { return this.typeContains("Planeswalker"); }
public final boolean isEnchantment() { return this.typeContains("Enchantment"); } public final boolean isEnchantment() { return this.typeContains("Enchantment"); }
public final boolean isAura() { return this.typeContains("Aura"); } public final boolean isAura() { return this.typeContains("Aura"); }
private boolean typeContains(final String s) { private boolean typeContains(final String s) {
final Iterator<String> it = this.getType().iterator(); final Iterator<String> it = this.getType().iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -7605,8 +7596,8 @@ public class Card extends GameEntity implements Comparable<Card> {
if (this.isPlaneswalker()) { if (this.isPlaneswalker()) {
this.subtractCounter(CounterType.LOYALTY, damageToAdd); this.subtractCounter(CounterType.LOYALTY, damageToAdd);
damageType = DamageType.LoyaltyLoss; damageType = DamageType.LoyaltyLoss;
} else { }
else {
final Game game = source.getGame(); final Game game = source.getGame();
final String s = this + " - destroy"; final String s = this + " - destroy";
@@ -8607,7 +8598,6 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
@Override @Override
public Game getGame() { public Game getGame() {
Player controller = getController(); Player controller = getController();
if (null != controller) if (null != controller)
return controller.getGame(); return controller.getGame();
@@ -8655,7 +8645,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return abilities; return abilities;
} }
public static Card fromPaperCard(IPaperCard pc, Player owner) { public static Card fromPaperCard(IPaperCard pc, Player owner) {
return CardFactory.getCard(pc, owner); return CardFactory.getCard(pc, owner);
} }