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

various comment cleanups in PlayerZoneComesIntoPlay and AbilityFactoryZoneAffecting

Browse Source
This commit is contained in:
slapshot5
2011-12-26 23:04:44 +00:00
parent 360682f6f8
commit 231f2fc6da
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/forge/PlayerZoneComesIntoPlay.java
View File

@@ -27,7 +27,7 @@ import forge.card.staticability.StaticAbility;
/** /**
* <p> * <p>
* PlayerZone_ComesIntoPlay class. * PlayerZoneComesIntoPlay class.
* </p> * </p>
* *
* @author Forge * @author Forge
@@ -42,7 +42,7 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
/** /**
* <p> * <p>
* Constructor for PlayerZone_ComesIntoPlay. * Constructor for PlayerZoneComesIntoPlay.
* </p> * </p>
* *
* @param zone * @param zone
@@ -58,7 +58,7 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
@Override @Override
public final void add(final Object o) { public final void add(final Object o) {
if (o == null) { if (o == null) {
throw new RuntimeException("PlayerZone_ComesInto Play : add() object is null"); throw new RuntimeException("PlayerZoneComesInto Play : add() object is null");
} }
super.add(o); super.add(o);
@@ -126,12 +126,6 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
if (c.isLand()) { if (c.isLand()) {
CardList list = c.getController().getCardsIn(Zone.Battlefield); CardList list = c.getController().getCardsIn(Zone.Battlefield);
/*
* CardList listValakut = list.filter(new CardListFilter() {
* public boolean addCard(Card c) { return
* c.getName().contains("Valakut, the Molten Pinnacle"); } });
*/
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
@@ -144,14 +138,6 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
GameActionUtil.executeLandfallEffects(list.get(i)); GameActionUtil.executeLandfallEffects(list.get(i));
} }
/*
* // Check for a mountain if (!listValakut.isEmpty() &&
* c.isType("Mountain") ) { for (int i = 0; i <
* listValakut.size(); i++) { boolean b =
* GameActionUtil.executeValakutEffect(listValakut.get(i),c); if
* (!b) { // Not enough mountains to activate Valakut -- stop
* the loop break; } } }
*/
// Tectonic Instability // Tectonic Instability
final CardList tis = AllZoneUtil.getCardsIn(Zone.Battlefield, "Tectonic Instability"); final CardList tis = AllZoneUtil.getCardsIn(Zone.Battlefield, "Tectonic Instability");
@@ -306,13 +292,8 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
for (final String effect : effects) { for (final String effect : effects) {
tempEffect = effect; tempEffect = effect;
AllZone.getStaticEffects().removeStateBasedEffect(effect); AllZone.getStaticEffects().removeStateBasedEffect(effect);
final Command comm = GameActionUtil.getCommands().get(tempEffect); // this // this is to make sure cards reset correctly
// is to final Command comm = GameActionUtil.getCommands().get(tempEffect);
// make
// sure
// cards
// reset
// correctly
comm.execute(); comm.execute();
} }

2
src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
View File

@@ -1477,7 +1477,7 @@ public class AbilityFactoryZoneAffecting {
* @param af * @param af
* a {@link forge.card.abilityfactory.AbilityFactory} object. * a {@link forge.card.abilityfactory.AbilityFactory} object.
* @param sa * @param sa
* TODO * a {@link forge.card.spellability.SpellAbility} object.
* @return a boolean. * @return a boolean.
*/ */
private static boolean discardTargetAI(final AbilityFactory af, final SpellAbility sa) { private static boolean discardTargetAI(final AbilityFactory af, final SpellAbility sa) {