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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-06-17 14:58:29 +00:00
parent ebe4722c55
commit 0d9000b7f1
11 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/card/cardfactory/CardFactorySorceries.java
View File

@@ -684,7 +684,8 @@ public class CardFactorySorceries {
@Override @Override
public AbilitySub getCopy() { public AbilitySub getCopy() {
AbilitySub res = new DrawbackDonate(getSourceCard(),getTarget() == null ? null : new Target(getTarget())); AbilitySub res = new DrawbackDonate(getSourceCard(),
getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
return res; return res;
} }

24
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -849,7 +849,8 @@ public class CardFactoryUtil {
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityUnearth(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityUnearth(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
final SpellAbilityRestriction restrict = new SpellAbilityRestriction(); final SpellAbilityRestriction restrict = new SpellAbilityRestriction();
restrict.setZone(ZoneType.Graveyard); restrict.setZone(ZoneType.Graveyard);
@@ -918,7 +919,8 @@ public class CardFactoryUtil {
public boolean canPlay() { public boolean canPlay() {
//Lands do not have SpellPermanents. //Lands do not have SpellPermanents.
if (sourceCard.isLand()) { if (sourceCard.isLand()) {
return (AllZone.getZoneOf(sourceCard).is(ZoneType.Hand) || sourceCard.hasKeyword("May be played") ) && PhaseHandler.canCastSorcery(sourceCard.getController()); return (AllZone.getZoneOf(sourceCard).is(ZoneType.Hand) || sourceCard.hasKeyword("May be played"))
&& PhaseHandler.canCastSorcery(sourceCard.getController());
} }
else { else {
return sourceCard.getSpellPermanent().canPlay(); return sourceCard.getSpellPermanent().canPlay();
@@ -1068,7 +1070,8 @@ public class CardFactoryUtil {
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityTransmute(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityTransmute(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
res.getRestrictions().setZone(ZoneType.Hand); res.getRestrictions().setZone(ZoneType.Hand);
return res; return res;
@@ -1213,7 +1216,8 @@ public class CardFactoryUtil {
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityEquip(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityEquip(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
return res; return res;
} }
@@ -3947,15 +3951,15 @@ public class CardFactoryUtil {
} }
} }
public static void correctAbilityChainSourceCard(final SpellAbility sa, final Card card) public static void correctAbilityChainSourceCard(final SpellAbility sa, final Card card) {
{
sa.setSourceCard(card); sa.setSourceCard(card);
if(sa.getAbilityFactory() != null) if (sa.getAbilityFactory() != null) {
{
sa.getAbilityFactory().setHostCard(card); sa.getAbilityFactory().setHostCard(card);
} }
if(sa.getSubAbility() != null) if (sa.getSubAbility() != null) {
{
correctAbilityChainSourceCard(sa.getSubAbility(), card); correctAbilityChainSourceCard(sa.getSubAbility(), card);
} }
} }

4
src/main/java/forge/card/staticability/StaticAbilityContinuous.java
View File

@@ -232,8 +232,8 @@ public class StaticAbilityContinuous {
CardList cardsIGainedAbilitiesFrom = AllZoneUtil.getCardsIn(validZones); CardList cardsIGainedAbilitiesFrom = AllZoneUtil.getCardsIn(validZones);
cardsIGainedAbilitiesFrom = cardsIGainedAbilitiesFrom.getValidCards(valids, hostCard.getController(), hostCard); cardsIGainedAbilitiesFrom = cardsIGainedAbilitiesFrom.getValidCards(valids, hostCard.getController(), hostCard);
if(cardsIGainedAbilitiesFrom.size() > 0) if (cardsIGainedAbilitiesFrom.size() > 0) {
{
addFullAbs = new ArrayList<SpellAbility>(); addFullAbs = new ArrayList<SpellAbility>();
for (Card c : cardsIGainedAbilitiesFrom) { for (Card c : cardsIGainedAbilitiesFrom) {

4
src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -783,8 +783,8 @@ public final class GuiDisplayUtil {
StaticEffects StaticHandler = AllZone.getStaticEffects(); StaticEffects StaticHandler = AllZone.getStaticEffects();
List<PlayerZone> Zones = new ArrayList<PlayerZone>(); List<PlayerZone> Zones = new ArrayList<PlayerZone>();
for(Player p : Players) for (Player p : Players) {
{
Zones.add(p.getZone(ZoneType.Ante)); Zones.add(p.getZone(ZoneType.Ante));
Zones.add(p.getZone(ZoneType.Battlefield)); Zones.add(p.getZone(ZoneType.Battlefield));
Zones.add(p.getZone(ZoneType.Command)); Zones.add(p.getZone(ZoneType.Command));