forked from External/mage
fix client NPE if Radiation trigger in trigger order panel
The frameStyle was unexpectedly null when displaying the trigger in the view to choose trigger panels. It was good on the stack so I missed that in initial implementation. Bug showed up once there was another trigger on Beginning of Main Phase, for instance Coalition Relic. The lack of frameStyle lead to a rendering NPE.
This commit is contained in:
parent
a35078440a
commit
c0c05579ba
3 changed files with 13 additions and 1 deletions
|
|
@ -96,11 +96,21 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
|
|||
case STACK:
|
||||
case HAND: // Miracle
|
||||
case LIBRARY:
|
||||
sourceObject = game.getObject(ability.getSourceId());
|
||||
if (sourceObject instanceof Card) {
|
||||
isCard = true;
|
||||
}
|
||||
break;
|
||||
case OUTSIDE:
|
||||
sourceObject = game.getObject(ability.getSourceId());
|
||||
if (sourceObject instanceof Card) {
|
||||
isCard = true;
|
||||
}
|
||||
if (sourceObject instanceof Emblem) {
|
||||
// Emblems are not normally OUTSIDE, except the special Radiation Emblem from rad counters.
|
||||
abilityView = new AbilityView(ability, sourceObject.getName(), new CardView(new EmblemView((Emblem) sourceObject)));
|
||||
abilityView.setName(sourceObject.getName());
|
||||
}
|
||||
break;
|
||||
case COMMAND:
|
||||
sourceObject = game.getObject(ability.getSourceId());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue