Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-29 03:49:19 +00:00
Code Issues Releases Activity

fix: prevent kicking when message is null/empty

Browse Source
This commit is contained in:
LoJoSho
2023-06-27 09:44:11 -05:00
parent b9e5096d33
commit 78f48703db
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java
View File

@@ -4,7 +4,6 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
import com.hibiscusmc.hmccosmetics.config.Settings;
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
import me.clip.placeholderapi.PlaceholderAPI;
@@ -26,14 +25,16 @@ import java.util.logging.Level;
public class MessagesUtil {
private static String prefix;
private static final HashMap<String, String> messages = new HashMap<>();
private static final HashMap<String, String> MESSAGES = new HashMap<>();
public static void setup(@NotNull ConfigurationNode config) {
MESSAGES.clear();
prefix = config.node("prefix").getString("");
for (ConfigurationNode node : config.childrenMap().values()) {
if (node.virtual()) continue;
if (node.empty()) continue;
messages.put(node.key().toString(), node.getString());
MESSAGES.put(node.key().toString(), node.getString());
}
}
@@ -43,6 +44,7 @@ public class MessagesUtil {
public static void sendMessage(Player player, String key) {
Component finalMessage = processString(player, key);
if (finalMessage == null) return;
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
target.sendMessage(finalMessage);
@@ -58,6 +60,7 @@ public class MessagesUtil {
public static void sendMessage(Player player, String key, TagResolver placeholder) {
Component finalMessage = processString(player, key, placeholder);
if (finalMessage == null) return;
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
target.sendMessage(finalMessage);
@@ -65,6 +68,7 @@ public class MessagesUtil {
public static void sendMessageNoKey(Player player, String message) {
Component finalMessage = processStringNoKey(player, message);
if (finalMessage == null) return;
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
target.sendMessage(finalMessage);
@@ -72,6 +76,7 @@ public class MessagesUtil {
public static void sendActionBar(Player player, String key) {
Component finalMessage = processString(player, key);
if (finalMessage == null) return;
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
target.sendActionBar(finalMessage);
@@ -96,9 +101,9 @@ public class MessagesUtil {
@Nullable
public static Component processString(Player player, String key, TagResolver placeholders) {
if (!messages.containsKey(key)) return null;
if (messages.get(key) == null) return null;
String message = messages.get(key);
if (!MESSAGES.containsKey(key)) return null;
if (MESSAGES.get(key) == null) return null;
String message = MESSAGES.get(key);
if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
message = message.replaceAll("%prefix%", prefix);
if (placeholders != null ) {