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

Merge branch 'city' into 'master'

Browse Source 
Fix originally printed property

Closes #1797

See merge request core-developers/forge!4453
This commit is contained in:
Michael Kamensky
2021-04-11 04:20:44 +00:00
parent eb99915912 5d8bd256f1
commit 673759f17b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.StaticData;
import forge.card.CardDb;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -31,6 +33,7 @@ import forge.game.spellability.OptionalCost;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.Zone; import forge.game.zone.Zone;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.item.PaperCard;
import forge.util.Expressions; import forge.util.Expressions;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
@@ -1792,7 +1795,8 @@ public class CardProperty {
} }
} else if (property.startsWith("set")) { } else if (property.startsWith("set")) {
final String setCode = property.substring(3, 6); final String setCode = property.substring(3, 6);
if (!card.getSetCode().equals(setCode)) { final PaperCard setCard = StaticData.instance().getCommonCards().getCardFromEdition(card.getName(), CardDb.SetPreference.Earliest);
if (!setCard.getEdition().equals(setCode)) {
return false; return false;
} }
} else if (property.startsWith("inZone")) { } else if (property.startsWith("inZone")) {