From 3adb94dc3d85b18dc3ae96c2b8f97a518b3a5cf6 Mon Sep 17 00:00:00 2001
From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Tue, 4 Apr 2023 23:34:40 +0800
Subject: [PATCH] 2.2.0.3-hotfix

---
 build.gradle                                        |  2 +-
 .../customnameplates/manager/FontManager.java       | 13 +++++++------
 src/main/resources/configs/custom-placeholders.yml  |  2 ++
 src/main/resources/configs/image-width.yml          |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4f443e4..5992a35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'net.momirealms'
-version = '2.2.0.3'
+version = '2.2.0.3-hotfix'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/net/momirealms/customnameplates/manager/FontManager.java b/src/main/java/net/momirealms/customnameplates/manager/FontManager.java
index b29559e..57eb467 100644
--- a/src/main/java/net/momirealms/customnameplates/manager/FontManager.java
+++ b/src/main/java/net/momirealms/customnameplates/manager/FontManager.java
@@ -110,11 +110,6 @@ public class FontManager extends Function {
         return plugin.getFontManager().getShortestNegChars(totalWidth + totalWidth % 2 + 1);
     }
 
-    // All the characters
-    public int getCharWidth(char c) {
-        return Objects.requireNonNullElse(customImageWidth.get(c), ConfigManager.default_width);
-    }
-
     // Player name
     public int getNameCharWidth(char c) {
         Integer width = asciiWidth.get(c);
@@ -126,7 +121,13 @@ public class FontManager extends Function {
         int length = text.length();
         int n = 0;
         for (int i = 0; i < length; i++) {
-            n += getCharWidth(text.charAt(i));
+            char current = text.charAt(i);
+            if (current != '\\' || i == length - 1 || text.charAt(i + 1) != '<') {
+                n += Objects.requireNonNullElse(customImageWidth.get(current), ConfigManager.default_width);
+            }
+            else {
+                n -= 1;
+            }
         }
         return n + length;
     }
diff --git a/src/main/resources/configs/custom-placeholders.yml b/src/main/resources/configs/custom-placeholders.yml
index 55c0e7e..28c3062 100644
--- a/src/main/resources/configs/custom-placeholders.yml
+++ b/src/main/resources/configs/custom-placeholders.yml
@@ -102,6 +102,7 @@ background-text:
     background: bedrock_2
     text: '<#FFFEFD>%nameplates_image_bell%</#FFFEFD> %nameplates_descent_update%'
     remove-shadow: true
+
 # %nameplates_static_{0}%
 static-text:
   money_hud:
@@ -115,6 +116,7 @@ static-text:
     value: 180
 
 # %nameplates_descent_{0}%
+# If the character can't show correctly here, use descent-unicode instead
 descent-text:
   player:
     text: "%player_name%"
diff --git a/src/main/resources/configs/image-width.yml b/src/main/resources/configs/image-width.yml
index c584f46..4803dd4 100644
--- a/src/main/resources/configs/image-width.yml
+++ b/src/main/resources/configs/image-width.yml
@@ -4,7 +4,7 @@
 # Placeholder
 '%img_coin%': 10
 
-# default
+# Default
 ¡: 1
 ‰: 7
 ­: 3