diff options
author | md_5 <git@md-5.net> | 2016-09-01 09:27:37 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-09-01 09:27:37 +1000 |
commit | a25e56c4b6133c9e77d0c71fc0b1db1ace430197 (patch) | |
tree | 8aff681595aa3b7cd96beea559bcc27a42250473 /src/main/java | |
parent | 55941791e10363558be365954215217eb6c6734f (diff) | |
download | bukkit-a25e56c4b6133c9e77d0c71fc0b1db1ace430197.tar bukkit-a25e56c4b6133c9e77d0c71fc0b1db1ace430197.tar.gz bukkit-a25e56c4b6133c9e77d0c71fc0b1db1ace430197.tar.lz bukkit-a25e56c4b6133c9e77d0c71fc0b1db1ace430197.tar.xz bukkit-a25e56c4b6133c9e77d0c71fc0b1db1ace430197.zip |
SPIGOT-2646: MapFont.getWidth with coloured text
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/map/MapFont.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/map/MapFont.java b/src/main/java/org/bukkit/map/MapFont.java index ea8f0ea8..ed70d1e9 100644 --- a/src/main/java/org/bukkit/map/MapFont.java +++ b/src/main/java/org/bukkit/map/MapFont.java @@ -1,6 +1,7 @@ package org.bukkit.map; import java.util.HashMap; +import org.bukkit.ChatColor; /** * Represents a bitmap font drawable to a map. @@ -58,7 +59,9 @@ public class MapFont { int result = 0; for (int i = 0; i < text.length(); ++i) { - result += chars.get(text.charAt(i)).getWidth(); + char ch = text.charAt(i); + if (ch == ChatColor.COLOR_CHAR) continue; + result += chars.get(ch).getWidth(); } result += text.length() - 1; // Account for 1px spacing between characters @@ -84,7 +87,7 @@ public class MapFont { public boolean isValid(String text) { for (int i = 0; i < text.length(); ++i) { char ch = text.charAt(i); - if (ch == '\u00A7' || ch == '\n') continue; + if (ch == ChatColor.COLOR_CHAR || ch == '\n') continue; if (chars.get(ch) == null) return false; } return true; |