diff --git a/Plugin/src/main/java/dev/lrxh/neptune/commands/MainCommand.java b/Plugin/src/main/java/dev/lrxh/neptune/commands/MainCommand.java index 16ea1cf..b87b2ba 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/commands/MainCommand.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/commands/MainCommand.java @@ -36,6 +36,7 @@ public void setspawn(Player player) { @Subcommand("reload") public void reload(Player player) { plugin.getConfigManager().load(); + plugin.getCosmeticManager().load(); player.sendMessage(CC.color("&aSuccessfully reloaded configs!")); } } \ No newline at end of file diff --git a/Plugin/src/main/java/dev/lrxh/neptune/cosmetics/menu/killMessages/KillMessageButton.java b/Plugin/src/main/java/dev/lrxh/neptune/cosmetics/menu/killMessages/KillMessageButton.java index d4c0b37..370f41d 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/cosmetics/menu/killMessages/KillMessageButton.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/cosmetics/menu/killMessages/KillMessageButton.java @@ -36,7 +36,7 @@ public ItemStack getButtonItem(Player player) { .replace("", selected ? CosmeticsLocale.SELECTED_DISPLAY_NAME.getString() : "")) .lore(ItemUtils.getLore(lore, new Replacement("", killMessagePackage.getDescription()), - new Replacement("", killMessagePackage.getMessages()))) + new Replacement("", ItemUtils.getLore(killMessagePackage.getMessages(), new Replacement("", player.getName()), new Replacement("", player.getName()))))) .clearFlags() .build(); } diff --git a/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java b/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java index 5b8d36a..6b069d1 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java @@ -120,8 +120,8 @@ public List getLore(List lore, Replacement... replacements) { for (Replacement replacement : replacements) { if (replacement.getReplacement() instanceof String) { line = line.replaceAll(replacement.getPlaceholder(), (String) replacement.getReplacement()); - }else if (replacement.getReplacement() instanceof List) { - if(line.contains(replacement.getPlaceholder())) { + } else if (replacement.getReplacement() instanceof List) { + if (line.contains(replacement.getPlaceholder())) { List replacementList = (List) replacement.getReplacement(); for (String replacementLine : replacementList) { newLore.add(line.replaceAll(replacement.getPlaceholder(), replacementLine)); @@ -132,7 +132,7 @@ public List getLore(List lore, Replacement... replacements) { line = line.replaceAll(replacement.getPlaceholder(), String.valueOf(replacement.getReplacement())); } } - if(!skip) newLore.add(line); + if (!skip) newLore.add(line); } return newLore; }