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

- Cleanup.

Browse Source
This commit is contained in:
Sloth
2012-11-25 15:11:10 +00:00
parent f0216839d0
commit 0086f71816
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/Card.java
View File

@@ -6498,8 +6498,7 @@ public class Card extends GameEntity implements Comparable<Card> {
if (list.indexOf(source) >= list.indexOf(this)) { if (list.indexOf(source) >= list.indexOf(this)) {
return false; return false;
} }
} else if (property.startsWith("DirectlyAbove")) { // "Are Directly Above" } else if (property.startsWith("DirectlyAbove")) { // "Are Directly Above" Source
// Source
final List<Card> list = this.getOwner().getCardsIn(ZoneType.Graveyard); final List<Card> list = this.getOwner().getCardsIn(ZoneType.Graveyard);
if (list.indexOf(this) - list.indexOf(source) != 1) { if (list.indexOf(this) - list.indexOf(source) != 1) {
return false; return false;
@@ -6564,17 +6563,14 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
return false; return false;
} else { } else {
boolean shares = false;
for (final Card card : sourceController.getCardsIn(ZoneType.Battlefield)) { for (final Card card : sourceController.getCardsIn(ZoneType.Battlefield)) {
if (card.isValid(restriction, sourceController, source) && this.sharesColorWith(card)) { if (card.isValid(restriction, sourceController, source) && this.sharesColorWith(card)) {
shares = true; return true;
} }
} }
if (!shares) {
return false; return false;
} }
} }
}
} else if (property.startsWith("sharesCreatureTypeWith")) { } else if (property.startsWith("sharesCreatureTypeWith")) {
if (property.equals("sharesCreatureTypeWith")) { if (property.equals("sharesCreatureTypeWith")) {
if (!this.sharesCreatureTypeWith(source)) { if (!this.sharesCreatureTypeWith(source)) {
@@ -6672,7 +6668,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return false; return false;
} }
} }
} else if (property.startsWith("SecondSpellCastThisTurn")) { } else if (property.startsWith("SecondSpellCastThisTurn")) {
final List<Card> list = CardUtil.getThisTurnCast("Card", source); final List<Card> list = CardUtil.getThisTurnCast("Card", source);
if (list.size() < 2) { if (list.size() < 2) {
@@ -6681,7 +6676,6 @@ public class Card extends GameEntity implements Comparable<Card> {
else if (list.get(1) != this) { else if (list.get(1) != this) {
return false; return false;
} }
} else if (property.startsWith("sharesTypeWith")) { } else if (property.startsWith("sharesTypeWith")) {
if (!this.sharesTypeWith(source)) { if (!this.sharesTypeWith(source)) {
return false; return false;