mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 02:08:00 +00:00
prevent NPE, update The Clone Saga trigger
This commit is contained in:
@@ -455,6 +455,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
|
|||||||
ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
|
ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
|
||||||
Map<Comparable<?>, Pile> piles = new TreeMap<>();
|
Map<Comparable<?>, Pile> piles = new TreeMap<>();
|
||||||
for (ItemInfo itemInfo : group.items) {
|
for (ItemInfo itemInfo : group.items) {
|
||||||
|
if (itemInfo == null)
|
||||||
|
continue;
|
||||||
Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
|
Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
|
||||||
if (key != null && !piles.containsKey(key)) {
|
if (key != null && !piles.containsKey(key)) {
|
||||||
piles.put(key, new Pile());
|
piles.put(key, new Pile());
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ SVar:DBSurveil:DB$ Surveil | Amount$ 3 | SpellDescription$ Surveil 3.
|
|||||||
SVar:DBCopyEffect:DB$ DelayedTrigger | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next cast a creature spell this turn, copy it, except the copy isn't legendary.
|
SVar:DBCopyEffect:DB$ DelayedTrigger | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next cast a creature spell this turn, copy it, except the copy isn't legendary.
|
||||||
SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | NonLegendary$ True
|
SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | NonLegendary$ True
|
||||||
SVar:DBDrawEffect:DB$ NameCard | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
SVar:DBDrawEffect:DB$ NameCard | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
||||||
SVar:DBEffect:DB$ Effect | Triggers$ DamageTrigger
|
SVar:DBEffect:DB$ Effect | Triggers$ TrigDamage
|
||||||
SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.NamedCard | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.NamedCard | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
||||||
SVar:TrigDraw:DB$ Draw
|
SVar:TrigDraw:DB$ Draw
|
||||||
Oracle:(As this Saga enters step, add a lore counter. Sacrifice after III.)\nI — Surveil 3.\nII — When you next cast a creature spell this turn, copy it, except the copy isn't legendary.\nIII — Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
Oracle:(As this Saga enters step, add a lore counter. Sacrifice after III.)\nI — Surveil 3.\nII — When you next cast a creature spell this turn, copy it, except the copy isn't legendary.\nIII — Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
|
||||||
|
|||||||
Reference in New Issue
Block a user