Skip to content

Commit fbece73

Browse files
authored
Merge pull request #20 from SytexMC/main
Fixed NullPointerException when you use a nullable player
2 parents 9530431 + d80241c commit fbece73

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/main/java/org/lushplugins/chatcolorhandler/ModernChatColorHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static Component translate(@Nullable String string, Player player) {
5353
* @param player Player to parse placeholders for
5454
* @param parsers Parsers which this message will be parsed through
5555
*/
56-
public static Component translate(@Nullable String string, Player player, @NotNull List<Parser> parsers) {
56+
public static Component translate(@Nullable String string, @Nullable Player player, @NotNull List<Parser> parsers) {
5757
ChatColorHandler.ensureInitialised();
5858

5959
if (string == null || string.isBlank()) {
@@ -67,7 +67,9 @@ public static Component translate(@Nullable String string, Player player, @NotNu
6767
.filter(Objects::nonNull)
6868
.toList());
6969

70-
return MiniMessageMessenger.MINI_MESSAGE.deserialize(legacyParsed, (Audience) player, tagResolver);
70+
return (player == null)
71+
? MiniMessageMessenger.MINI_MESSAGE.deserialize(legacyParsed, tagResolver)
72+
: MiniMessageMessenger.MINI_MESSAGE.deserialize(legacyParsed, (Audience) player, tagResolver);
7173
}
7274

7375
/**

0 commit comments

Comments
 (0)