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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-05-23 17:36:07 +02:00
parent 9232042b02
commit c39313d973
8 changed files with 28 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
View File

@@ -314,7 +314,6 @@ public class AnimateEffect extends AnimateEffectBase {
sb.append(".");
}
return sb.toString();
}

12
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -57,17 +57,9 @@ import forge.util.collect.FCollectionView;
public class ChangeZoneEffect extends SpellAbilityEffect {
private boolean isHidden(SpellAbility sa) {
boolean hidden = sa.hasParam("Hidden");
if (!hidden && sa.hasParam("Origin")) {
hidden = ZoneType.isHidden(sa.getParam("Origin"));
}
return hidden;
}
@Override
protected String getStackDescription(SpellAbility sa) {
if (isHidden(sa)) {
if (sa.isHidden()) {
return changeHiddenOriginStackDescription(sa);
}
return changeKnownOriginStackDescription(sa);
@@ -424,7 +416,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
return;
}
if (isHidden(sa) && !sa.hasParam("Ninjutsu")) {
if (sa.isHidden() && !sa.hasParam("Ninjutsu")) {
changeHiddenOriginResolve(sa);
} else {
//else if (isKnown(origin) || sa.containsKey("Ninjutsu")) {

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

@@ -2378,4 +2378,12 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
}
rollbackEffects.clear();
}
public boolean isHidden() {
boolean hidden = hasParam("Hidden");
if (!hidden && hasParam("Origin")) {
hidden = ZoneType.isHidden(getParam("Origin"));
}
return hidden;
}
}