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

- Fixed Spellweaver Helix

Browse Source
This commit is contained in:
swordshine
2013-05-02 08:15:04 +00:00
parent 428b91c13c
commit f895ae627d
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5855,6 +5855,24 @@ public class Card extends GameEntity implements Comparable<Card> {
return false;
}
}
} else if (property.startsWith("doesNotShareNameWith")) {
if (property.equals("doesNotShareNameWith")) {
if (this.getName().equals(source.getName())) {
return false;
}
} else {
final String restriction = property.split("doesNotShareNameWith ")[1];
if (restriction.equals("Remembered")) {
for (final Object rem : source.getRemembered()) {
if (rem instanceof Card) {
final Card card = (Card) rem;
if (this.getName().equals(card.getName())) {
return false;
}
}
}
}
}
} else if (property.startsWith("sharesControllerWith")) {
if (property.equals("sharesControllerWith")) {
if (!this.sharesControllerWith(source)) {

20
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -984,26 +984,6 @@ public class AbilityUtils {
if (card.getEffectSource() != null) {
sas.addAll(card.getEffectSource().getSpellAbilities());
}
} else if (defined.equals("Imprinted.doesNotShareNameWith+TriggeredCard+Exiled")) {
//get Imprinted list
ArrayList<SpellAbility> imprintedCards = new ArrayList<SpellAbility>();
for (final Card imp : card.getImprinted()) {
imprintedCards.addAll(imp.getSpellAbilities());
} //get Triggered card
Card triggeredCard = null;
final SpellAbility root = sa.getRootAbility();
final Object crd = root.getTriggeringObject("Card");
if (crd instanceof Card) {
triggeredCard = game.getCardState((Card) crd);
} //find the imprinted card that does not share a name with the triggered card
for (final SpellAbility spell : imprintedCards) {
if (!spell.getSourceCard().getName().equals(triggeredCard.getName())) {
sas.add(spell);
}
} //is it exiled?
if (!sas.get(0).getSourceCard().isInZone(ZoneType.Exile)) {
sas.clear();
}
}
if (s != null) {