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

Restore fixes somehow dropped by 017a4c (#2108)

Browse Source
This commit is contained in:
tool4ever
2022-12-15 16:03:54 +01:00
committed by GitHub
parent d7ea64ef85
commit 9804d0bb55
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1896,9 +1896,12 @@ 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.getName().isEmpty()) {
return false;
}
final PaperCard setCard = StaticData.instance().getCommonCards().getCardFromEditions(card.getName(), final PaperCard setCard = StaticData.instance().getCommonCards().getCardFromEditions(card.getName(),
CardDb.CardArtPreference.ORIGINAL_ART_ALL_EDITIONS); CardDb.CardArtPreference.ORIGINAL_ART_ALL_EDITIONS);
if (!setCard.getEdition().equals(setCode)) { if (setCard != null && !setCard.getEdition().equals(setCode)) {
return false; return false;
} }
} else if (property.startsWith("inZone")) { } else if (property.startsWith("inZone")) {

1
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -200,6 +200,7 @@ public class AbilityManaPart implements java.io.Serializable {
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(getSourceCard()); final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(getSourceCard());
runParams.put(AbilityKey.Produced, mana); runParams.put(AbilityKey.Produced, mana);
runParams.put(AbilityKey.AbilityMana, root);
runParams.put(AbilityKey.Activator, root.getActivatingPlayer()); runParams.put(AbilityKey.Activator, root.getActivatingPlayer());
getSourceCard().getGame().getTriggerHandler().runTrigger(TriggerType.TapsForMana, runParams, false); getSourceCard().getGame().getTriggerHandler().runTrigger(TriggerType.TapsForMana, runParams, false);

2
forge-gui/res/cardsfolder/c/city_in_a_bottle.txt
View File

@@ -2,7 +2,7 @@ Name:City in a Bottle
ManaCost:2 ManaCost:2
Types:Artifact Types:Artifact
T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nonToken+setARN+Other | Execute$ TrigSac | TriggerDescription$ Whenever one or more other nontoken permanents with a name originally printed in the Arabian Nights expansion are on the battlefield, their controllers sacrifice them. T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nonToken+setARN+Other | Execute$ TrigSac | TriggerDescription$ Whenever one or more other nontoken permanents with a name originally printed in the Arabian Nights expansion are on the battlefield, their controllers sacrifice them.
SVar:TrigSac:DB$ SacrificeAll | ValidCards$ Permanent.nontoken+setARN+Other SVar:TrigSac:DB$ SacrificeAll | ValidCards$ Permanent.nonToken+setARN+Other
S:Mode$ CantPlayLand | ValidCard$ Card.setARN | Description$ Players can't cast spells or play lands with a name originally printed in the Arabian Nights expansion. S:Mode$ CantPlayLand | ValidCard$ Card.setARN | Description$ Players can't cast spells or play lands with a name originally printed in the Arabian Nights expansion.
S:Mode$ CantBeCast | ValidCard$ Card.setARN S:Mode$ CantBeCast | ValidCard$ Card.setARN
AI:RemoveDeck:All AI:RemoveDeck:All