Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
MessageUtil: fix null fplayer check
Browse files Browse the repository at this point in the history
  • Loading branch information
TheFaser committed Nov 18, 2023
1 parent a9f920c commit 9a6b6a5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/main/java/net/flectone/chat/util/MessageUtil.java
Original file line number Diff line number Diff line change
@@ -71,7 +71,8 @@ public static String formatPAPI(@Nullable Player sender, @NotNull Player recipie

@NotNull
public static String formatPlayerString(@Nullable CommandSender commandSender, @NotNull String string) {
if (!(commandSender instanceof Player player)) {
if (!(commandSender instanceof Player player)
|| FlectoneChat.getPlugin().getPlayerManager().get(player) == null) {
String commandSenderName = commandSender == null ? "CONSOLE" : commandSender.getName();
return string
.replace("<player_name_tab>", commandSenderName)
@@ -87,9 +88,6 @@ public static String formatPlayerString(@Nullable CommandSender commandSender, @
.replace("<afk_suffix>", "");
}

FPlayer fPlayer = FlectoneChat.getPlugin().getPlayerManager().get(player);
if (fPlayer == null) return string;

FModule fModule = FlectoneChat.getPlugin().getModuleManager().get(NameModule.class);
if (fModule instanceof NameModule nameModule) {
if (string.contains("<player_name_tab")) {
@@ -113,7 +111,9 @@ public static String formatPlayerString(@Nullable CommandSender commandSender, @
}
}

return string
FPlayer fPlayer = FlectoneChat.getPlugin().getPlayerManager().get(player);

return string
.replace("<vault_prefix>", PlayerUtil.getPrefix(player))
.replace("<world_prefix>", fPlayer.getWorldPrefix())
.replace("<stream_prefix>", fPlayer.getStreamPrefix())

0 comments on commit 9a6b6a5

Please sign in to comment.