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

More code cleanup

Browse Source
This commit is contained in:
drdev
2014-09-07 18:31:39 +00:00
parent 1fca98c134
commit b8b26657f9
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -78,7 +78,7 @@ import java.util.StringTokenizer;
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
if (sa.hasParam("Announce")) { if (sa.hasParam("Announce")) {
String svar = sa.getParam("Announce"); String svar = sa.getParam("Announce");
int amount = CardFactoryUtil.xCount(sa.getHostCard(), sa.getSVar(svar)); int amount = CardFactoryUtil.xCount(sa.getHostCard(), sa.getSVar(svar));

5
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -1353,9 +1353,10 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
String announce = getParam("Announce"); String announce = getParam("Announce");
if (StringUtils.isBlank(announce)) return false; if (StringUtils.isBlank(announce)) return false;
String[] announcedOnes = TextUtil.split(announce, ','); String[] announcedOnes = TextUtil.split(announce, ',');
for(String a : announcedOnes) { for (String a : announcedOnes) {
if( a.trim().equalsIgnoreCase(variable)) if (a.trim().equalsIgnoreCase(variable)) {
return true; return true;
}
} }
return false; return false;
} }

3
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -338,7 +338,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
} }
if (sp.isCopied()) { if (sp.isCopied()) {
si = this.push(sp); si = this.push(sp);
} else { }
else {
if (sp.isMultiKicker()) { if (sp.isMultiKicker()) {
final Cost costMultikicker = new Cost(sp.getMultiKickerManaCost(), false); final Cost costMultikicker = new Cost(sp.getMultiKickerManaCost(), false);
boolean hasPaid = false; boolean hasPaid = false;

2
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -712,7 +712,7 @@ public class HumanPlay {
} }
if (isActivatedSa) { if (isActivatedSa) {
ManaCostAdjustment.adjust(toPay, ability, false); ManaCostAdjustment.adjust(toPay, ability, false);
} }
InputPayMana inpPayment; InputPayMana inpPayment;