From 588a2f1eba7b96c2b552a4673d32c6bb94b927ac Mon Sep 17 00:00:00 2001 From: speed <43330808+speedxx@users.noreply.github.com> Date: Sat, 18 Jul 2020 19:51:17 -0400 Subject: [PATCH] fix npe in /myinfo --- .../totalfreedom/totalfreedommod/util/FUtil.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index ae63293e..d7a4af71 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -591,14 +591,17 @@ public class FUtil public static String colorize(String string) { - Matcher matcher = Pattern.compile("&#[a-f0-9A-F]{6}").matcher(string); - while (matcher.find()) + if (string != null) { - String code = matcher.group().replace("&", ""); - string = string.replace("&" + code, net.md_5.bungee.api.ChatColor.of(code) + ""); - } + Matcher matcher = Pattern.compile("&#[a-f0-9A-F]{6}").matcher(string); + while (matcher.find()) + { + String code = matcher.group().replace("&", ""); + string = string.replace("&" + code, net.md_5.bungee.api.ChatColor.of(code) + ""); + } - string = ChatColor.translateAlternateColorCodes('&', string); + string = ChatColor.translateAlternateColorCodes('&', string); + } return string; }