External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 03:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the CardViewer not displaying tokens (#10789)

Browse source
This commit is contained in:
Susucre 2023-08-13 20:10:48 +02:00 • committed by GitHub
parent 2b18dc432c
commit 8457ce31c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Mage.Common/src/main/java/mage/view/PermanentView.java
View file

@ -92,12 +92,14 @@ public class PermanentView extends CardView {
this.nameOwner = ""; this.nameOwner = "";
} }
Player controller = game.getPlayer(permanent.getControllerId()); String nameController = "";
if (controller != null) { if (game != null) {
nameController = controller.getName(); Player controller = game.getPlayer(permanent.getControllerId());
} else { if (controller != null) {
nameController = ""; nameController = controller.getName();
}
} }
this.nameController = nameController;
// add info for face down permanents // add info for face down permanents
if (permanent.isFaceDown(game) && card != null) { if (permanent.isFaceDown(game) && card != null) {
@ -125,15 +127,19 @@ public class PermanentView extends CardView {
} }
} }
} }
// determines if shown in it's own column // determines if shown in it's own column
Permanent attachment = game.getPermanent(permanent.getAttachedTo()); boolean attachedToPermanent = false;
if (attachment != null) { boolean attachedControllerDiffers = false;
attachedToPermanent = true; if (game != null) {
attachedControllerDiffers = !attachment.getControllerId().equals(permanent.getControllerId()); Permanent attachment = game.getPermanent(permanent.getAttachedTo());
} else { if (attachment != null) {
attachedToPermanent = false; attachedToPermanent = true;
attachedControllerDiffers = false; attachedControllerDiffers = !attachment.getControllerId().equals(permanent.getControllerId());
}
} }
this.attachedToPermanent = attachedToPermanent;
this.attachedControllerDiffers = attachedControllerDiffers;
} }
public boolean isTapped() { public boolean isTapped() {