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

cleanup some minor Java things

Browse Source
This commit is contained in:
slapshot5
2011-11-05 05:11:26 +00:00
parent 1e9926de67
commit 9888cdae56
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6292,7 +6292,7 @@ public class Card extends GameEntity implements Comparable<Card> {
return false; return false;
} }
String[] incR = restriction.split("\\.",2); // Inclusive restrictions are String[] incR = restriction.split("\\.", 2); // Inclusive restrictions are
// Card types // Card types
if (incR[0].equals("Spell") && !isSpell()) { if (incR[0].equals("Spell") && !isSpell()) {
@@ -6635,8 +6635,9 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
} }
} else if (property.startsWith("power") || } else if (property.startsWith("power")
property.startsWith("toughness") || property.startsWith("cmc")) { || property.startsWith("toughness")
|| property.startsWith("cmc")) {
int x = 0; int x = 0;
int y = 0; int y = 0;
String rhs = ""; String rhs = "";

3
src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
View File

@@ -675,12 +675,15 @@ public final class AbilityFactoryCopy {
private static boolean copySpellTriggerAI(final AbilityFactory af, final SpellAbility sa, final boolean mandatory) { private static boolean copySpellTriggerAI(final AbilityFactory af, final SpellAbility sa, final boolean mandatory) {
final boolean randomReturn = false; final boolean randomReturn = false;
//comment out the af.hasSubAbility() until it's used. randomReturn is always false.
/*
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final AbilitySub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return randomReturn && abSub.chkAIDrawback(); return randomReturn && abSub.chkAIDrawback();
} }
} }
*/
return randomReturn; return randomReturn;
} }

1
src/main/java/forge/quest/gui/QuestWinLoseHandler.java
View File

@@ -11,7 +11,6 @@ import javax.swing.ImageIcon;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import net.slightlymagic.maxmtg.Predicate;
import forge.AllZone; import forge.AllZone;
import forge.CardList; import forge.CardList;
import forge.Constant; import forge.Constant;