diff options
| author | ohowe <42757516+carelesshippo@users.noreply.github.com> | 2021-06-02 11:55:36 -0600 |
|---|---|---|
| committer | ohowe <42757516+carelesshippo@users.noreply.github.com> | 2021-06-02 11:55:36 -0600 |
| commit | eeb5c45d71997cb259fc35330490a19db7865603 (patch) | |
| tree | 65771b27ed837896fa3140dec1af78306accebcd /src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java | |
| parent | 4d9e538ced80728bca74491698347333f515bfcc (diff) | |
| parent | 1b172089ce502803f7644611afd618ce00dcb860 (diff) | |
| download | notenoughupdates-eeb5c45d71997cb259fc35330490a19db7865603.tar.gz notenoughupdates-eeb5c45d71997cb259fc35330490a19db7865603.tar.bz2 notenoughupdates-eeb5c45d71997cb259fc35330490a19db7865603.zip | |
Merge branch 'Moulberry:master' into master
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java index c2f778a5..553a5d40 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java @@ -13,6 +13,7 @@ public class DamageCommas { private static final HashMap<Integer, ChatComponentText> replacementMap = new HashMap<>(); + //From [MVP++] HY7: private static final EnumChatFormatting[] colours = {EnumChatFormatting.RED, EnumChatFormatting.GOLD, EnumChatFormatting.YELLOW, EnumChatFormatting.WHITE}; public static void tick() { @@ -31,8 +32,8 @@ public class DamageCommas { return component; } - if(formatted.length() >= 7 && formatted.startsWith("\u00A7f\u2727") && - formatted.endsWith("\u2727\u00a7r")) { + if(formatted.length() >= 7 && (formatted.startsWith("\u00A7f\u2727") || formatted.startsWith("\u00A7f\u2694")) && + (formatted.endsWith("\u2727\u00a7r") || formatted.endsWith("\u2694\u00a7r"))) { if(NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) { String numbers = Utils.cleanColour(formatted.substring(3, formatted.length()-3)).trim().replaceAll("[^0-9]", ""); |