From ef4431e7f2d6b52010150a88ec2f099e19765686 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 24 May 2025 20:12:53 +0400 Subject: [PATCH] merge fix --- .../java/mage/client/components/EdhPowerLevelLegalityLabel.java | 2 +- .../Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/components/EdhPowerLevelLegalityLabel.java b/Mage.Client/src/main/java/mage/client/components/EdhPowerLevelLegalityLabel.java index 1133eaac986..fd96815df30 100644 --- a/Mage.Client/src/main/java/mage/client/components/EdhPowerLevelLegalityLabel.java +++ b/Mage.Client/src/main/java/mage/client/components/EdhPowerLevelLegalityLabel.java @@ -59,7 +59,7 @@ public class EdhPowerLevelLegalityLabel extends LegalityLabel { // use 60% font for better and compatible list int infoFontSize = Math.round(GUISizeHelper.cardTooltipFont.getSize() * 0.6f); int maxLimit = 25; - String extraInfo = this.foundPowerCards.size() <= maxLimit ? "" : String.format("
  • and %d more cards
    • ", maxLimit - this.foundPowerCards.size()); + String extraInfo = this.foundPowerCards.size() <= maxLimit ? "" : String.format("
  • and %d more cards
    • ", this.foundPowerCards.size() - maxLimit); return foundInfo.stream() .limit(maxLimit) .reduce("" diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java index b2ab1adee77..99168e5ea3b 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java @@ -260,6 +260,7 @@ public abstract class AbstractCommander extends Constructed { @Override public int getEdhPowerLevel(Deck deck, List foundPowerCards, List foundInfo) { // calculate power level and find all related cards with it to show in hints (see deck validation in deck editor) + // example: https://edhpowerlevel.com int edhPowerLevel = 0; int commanderColors = 0; int numberInfinitePieces = 0;