From 6b5108770cf3a4de6d97a31cb542a28b5cc91211 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 19 May 2020 00:27:42 +0400 Subject: [PATCH] * UI: fixed wrong ability text capitalization in mode choose dialog; --- Mage.Common/src/main/java/mage/view/AbilityPickerView.java | 4 +++- .../Mage.Player.Human/src/mage/player/human/HumanPlayer.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Mage.Common/src/main/java/mage/view/AbilityPickerView.java b/Mage.Common/src/main/java/mage/view/AbilityPickerView.java index 7cb356d20bf..d4ae6a0c231 100644 --- a/Mage.Common/src/main/java/mage/view/AbilityPickerView.java +++ b/Mage.Common/src/main/java/mage/view/AbilityPickerView.java @@ -49,7 +49,9 @@ public class AbilityPickerView implements Serializable { if (rule.isEmpty()) { rule = ability.toString(); } - rule = Character.toUpperCase(rule.charAt(0)) + rule.substring(1); + if (!rule.isEmpty()) { + rule = Character.toUpperCase(rule.charAt(0)) + rule.substring(1); + } return rule; } diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 10632fbf1d9..edd52b2c80e 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -2096,6 +2096,9 @@ public class HumanPlayer extends PlayerImpl { modeText = "(selected " + timesSelected + "x) " + modeText; } } + if (!modeText.isEmpty()) { + modeText = Character.toUpperCase(modeText.charAt(0)) + modeText.substring(1); + } modeMap.put(mode.getId(), modeIndex + ". " + modeText); } }