From c28920643d98217a50ad5fe71a166105fb29dbf8 Mon Sep 17 00:00:00 2001 From: Parker Hawke Date: Fri, 3 May 2019 15:51:10 -0400 Subject: [PATCH] Better validate static ChatColor methods --- src/main/java/org/bukkit/ChatColor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java index e1552156..103debd1 100644 --- a/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java @@ -214,6 +214,8 @@ public enum ChatColor { */ @NotNull public static String translateAlternateColorCodes(char altColorChar, @NotNull String textToTranslate) { + Validate.notNull(textToTranslate, "Cannot translate null text"); + char[] b = textToTranslate.toCharArray(); for (int i = 0; i < b.length - 1; i++) { if (b[i] == altColorChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i+1]) > -1) { @@ -232,6 +234,8 @@ public enum ChatColor { */ @NotNull public static String getLastColors(@NotNull String input) { + Validate.notNull(input, "Cannot get last colors from null text"); + String result = ""; int length = input.length();