mirror of
https://github.com/magefree/mage.git
synced 2025-12-21 11:02:00 -08:00
...
This commit is contained in:
parent
c3b427ee16
commit
44bbc23388
1 changed files with 6 additions and 1 deletions
|
|
@ -33,6 +33,7 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import mage.Constants.PhaseStep;
|
import mage.Constants.PhaseStep;
|
||||||
import mage.Constants.TurnPhase;
|
import mage.Constants.TurnPhase;
|
||||||
|
import mage.MageObject;
|
||||||
import mage.game.ExileZone;
|
import mage.game.ExileZone;
|
||||||
import mage.game.GameState;
|
import mage.game.GameState;
|
||||||
import mage.game.combat.CombatGroup;
|
import mage.game.combat.CombatGroup;
|
||||||
|
|
@ -65,7 +66,11 @@ public class GameView implements Serializable {
|
||||||
}
|
}
|
||||||
for (StackObject stackObject: game.getStack()) {
|
for (StackObject stackObject: game.getStack()) {
|
||||||
if (stackObject instanceof StackAbility) {
|
if (stackObject instanceof StackAbility) {
|
||||||
stack.add(new StackAbilityView((StackAbility)stackObject, game.getObject(stackObject.getSourceId()).getName()));
|
MageObject object = game.getObject(stackObject.getSourceId());
|
||||||
|
if (object != null)
|
||||||
|
stack.add(new StackAbilityView((StackAbility)stackObject, object.getName()));
|
||||||
|
else
|
||||||
|
stack.add(new StackAbilityView((StackAbility)stackObject, ""));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
stack.add(new CardView((Spell)stackObject));
|
stack.add(new CardView((Spell)stackObject));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue