From 8457ce31c5970b908861ba53c0067b388a8fdf4b Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Sun, 13 Aug 2023 20:10:48 +0200 Subject: [PATCH] fix the CardViewer not displaying tokens (#10789) --- .../main/java/mage/view/PermanentView.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/Mage.Common/src/main/java/mage/view/PermanentView.java b/Mage.Common/src/main/java/mage/view/PermanentView.java index 52189ca2da9..d9416d18513 100644 --- a/Mage.Common/src/main/java/mage/view/PermanentView.java +++ b/Mage.Common/src/main/java/mage/view/PermanentView.java @@ -92,12 +92,14 @@ public class PermanentView extends CardView { this.nameOwner = ""; } - Player controller = game.getPlayer(permanent.getControllerId()); - if (controller != null) { - nameController = controller.getName(); - } else { - nameController = ""; + String nameController = ""; + if (game != null) { + Player controller = game.getPlayer(permanent.getControllerId()); + if (controller != null) { + nameController = controller.getName(); + } } + this.nameController = nameController; // add info for face down permanents if (permanent.isFaceDown(game) && card != null) { @@ -125,15 +127,19 @@ public class PermanentView extends CardView { } } } + // determines if shown in it's own column - Permanent attachment = game.getPermanent(permanent.getAttachedTo()); - if (attachment != null) { - attachedToPermanent = true; - attachedControllerDiffers = !attachment.getControllerId().equals(permanent.getControllerId()); - } else { - attachedToPermanent = false; - attachedControllerDiffers = false; + boolean attachedToPermanent = false; + boolean attachedControllerDiffers = false; + if (game != null) { + Permanent attachment = game.getPermanent(permanent.getAttachedTo()); + if (attachment != null) { + attachedToPermanent = true; + attachedControllerDiffers = !attachment.getControllerId().equals(permanent.getControllerId()); + } } + this.attachedToPermanent = attachedToPermanent; + this.attachedControllerDiffers = attachedControllerDiffers; } public boolean isTapped() {