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

- Cleanup and FindBugs fixes.

Browse Source
This commit is contained in:
Sloth
2012-11-30 19:54:34 +00:00
parent 647f4d91eb
commit 4846abb166
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/card/spellability/AbilityManaPart.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import forge.Card;
import forge.Singletons;
import forge.card.cost.Cost;
import forge.card.mana.Mana;
import forge.card.mana.ManaPool;
import forge.card.trigger.TriggerType;
@@ -55,8 +54,6 @@ public class AbilityManaPart implements java.io.Serializable {
private final transient Card sourceCard;
private transient Cost cost;
// Spells paid with this mana spell can't be countered.
private boolean cannotCounterSpell;
@@ -408,13 +405,7 @@ public class AbilityManaPart implements java.io.Serializable {
final AbilityManaPart abm = (AbilityManaPart) o;
// if (abm.getType() != this.getType()) {
// return false;
// }
return cost.equals(abm.cost) && sourceCard.equals(abm.sourceCard);
// return abm.toUnsuppressedString().equals(this.toUnsuppressedString());
return sourceCard.equals(abm.sourceCard) && origProduced.equals(abm.getOrigProduced());
}
/** {@inheritDoc} */

6
src/main/java/forge/game/zone/Zone.java
View File

@@ -43,12 +43,12 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria
private static final long serialVersionUID = -5687652485777639176L;
/** The cards. */
protected final List<Card> cardList = new ArrayList<Card>();
protected final List<Card> roCardList;
protected transient final List<Card> cardList = new ArrayList<Card>();
protected transient final List<Card> roCardList;
protected final ZoneType zoneName;
protected boolean update = true;
protected final List<Card> cardsAddedThisTurn = new ArrayList<Card>();
protected transient final List<Card> cardsAddedThisTurn = new ArrayList<Card>();
protected final ArrayList<ZoneType> cardsAddedThisTurnSource = new ArrayList<ZoneType>();