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

Merge remote-tracking branch 'upstream/master' into anothernahirifix

Browse Source
This commit is contained in:
Simisays
2023-08-05 17:21:56 +02:00
parent 734d68a4e0 6e176640d5
commit 7aa7a5ae34
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,13 +77,21 @@ public class MakeCardEffect extends SpellAbilityEffect {
for (String s : spellbook) { for (String s : spellbook) {
// Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord) // Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord)
s = s.replace(";", ","); s = s.replace(";", ",");
faces.add(StaticData.instance().getCommonCards().getFaceByName(s)); ICardFace face = StaticData.instance().getCommonCards().getFaceByName(s);
if (face != null)
faces.add(face);
else
throw new RuntimeException("MakeCardEffect didn't find card face by name: " + s);
} }
} else if (sa.hasParam("Booster")) { } else if (sa.hasParam("Booster")) {
SealedProduct.Template booster = Aggregates.random(StaticData.instance().getBoosters()); SealedProduct.Template booster = Aggregates.random(StaticData.instance().getBoosters());
pack = new BoosterPack(booster.getEdition(), booster).getCards(); pack = new BoosterPack(booster.getEdition(), booster).getCards();
for (PaperCard pc : pack) { for (PaperCard pc : pack) {
faces.add(pc.getRules().getMainPart()); ICardFace face = pc.getRules().getMainPart();
if (face != null)
faces.add(face);
else
throw new RuntimeException("MakeCardEffect didn't find card face by name: " + pc);
} }
} }