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

Avoid removing source card from lists

Browse Source
This commit is contained in:
drdev
2013-12-10 00:17:46 +00:00
parent 14a7176325
commit c65031ea31
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/game/cost/CostDiscard.java
View File

@@ -121,9 +121,6 @@ public class CostDiscard extends CostPartWithList {
} }
} }
else { else {
if (source.isInZone(ZoneType.Hand)) {
handList.remove(source); //source can't pay for itself
}
if (type.equals("Hand")) { if (type.equals("Hand")) {
// this will always work // this will always work
} }
@@ -178,10 +175,6 @@ public class CostDiscard extends CostPartWithList {
return handList.contains(source) && executePayment(ability, source); return handList.contains(source) && executePayment(ability, source);
} }
if (source.isInZone(ZoneType.Hand)) {
handList.remove(source); //ensure source can't be discarded to pay its own additional cost
}
if (discardType.equals("Hand")) { if (discardType.equals("Hand")) {
return executePayment(ability, handList); return executePayment(ability, handList);
} }

7
forge-gui/src/main/java/forge/game/cost/CostExile.java
View File

@@ -183,9 +183,6 @@ public class CostExile extends CostPartWithList {
return list.contains(source); return list.contains(source);
} }
if (source.isInZone(this.from)) {
list.remove(source); //source can't pay for itself
}
list = CardLists.getValidCards(list, type.split(";"), activator, source); list = CardLists.getValidCards(list, type.split(";"), activator, source);
final Integer amount = this.convertAmount(); final Integer amount = this.convertAmount();
@@ -248,10 +245,6 @@ public class CostExile extends CostPartWithList {
return source.getZone() == activator.getZone(from) && GuiDialog.confirm(source, source.getName() + " - Exile?") && executePayment(ability, source); return source.getZone() == activator.getZone(from) && GuiDialog.confirm(source, source.getName() + " - Exile?") && executePayment(ability, source);
} }
if (source.isInZone(this.from)) {
list.remove(source); //ensure source can't be exiled to pay its own additional cost
}
if (type.equals("All")) { if (type.equals("All")) {
for (final Card card : list) { for (final Card card : list) {
executePayment(ability, card); executePayment(ability, card);