Skip to content

Commit 1bb24b0

Browse files
committed
Fixed config issue with kill messages
1 parent ceaf74d commit 1bb24b0

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

Plugin/src/main/java/dev/lrxh/neptune/commands/MainCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void setspawn(Player player) {
3636
@Subcommand("reload")
3737
public void reload(Player player) {
3838
plugin.getConfigManager().load();
39+
plugin.getCosmeticManager().load();
3940
player.sendMessage(CC.color("&aSuccessfully reloaded configs!"));
4041
}
4142
}

Plugin/src/main/java/dev/lrxh/neptune/cosmetics/menu/killMessages/KillMessageButton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public ItemStack getButtonItem(Player player) {
3636
.replace("<selected>", selected ? CosmeticsLocale.SELECTED_DISPLAY_NAME.getString() : ""))
3737
.lore(ItemUtils.getLore(lore,
3838
new Replacement("<description>", killMessagePackage.getDescription()),
39-
new Replacement("<messages>", killMessagePackage.getMessages())))
39+
new Replacement("<messages>", ItemUtils.getLore(killMessagePackage.getMessages(), new Replacement("<player>", player.getName()), new Replacement("<killer>", player.getName())))))
4040
.clearFlags()
4141
.build();
4242
}

Plugin/src/main/java/dev/lrxh/neptune/utils/ItemUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public List<String> getLore(List<String> lore, Replacement... replacements) {
120120
for (Replacement replacement : replacements) {
121121
if (replacement.getReplacement() instanceof String) {
122122
line = line.replaceAll(replacement.getPlaceholder(), (String) replacement.getReplacement());
123-
}else if (replacement.getReplacement() instanceof List<?>) {
124-
if(line.contains(replacement.getPlaceholder())) {
123+
} else if (replacement.getReplacement() instanceof List<?>) {
124+
if (line.contains(replacement.getPlaceholder())) {
125125
List<String> replacementList = (List<String>) replacement.getReplacement();
126126
for (String replacementLine : replacementList) {
127127
newLore.add(line.replaceAll(replacement.getPlaceholder(), replacementLine));
@@ -132,7 +132,7 @@ public List<String> getLore(List<String> lore, Replacement... replacements) {
132132
line = line.replaceAll(replacement.getPlaceholder(), String.valueOf(replacement.getReplacement()));
133133
}
134134
}
135-
if(!skip) newLore.add(line);
135+
if (!skip) newLore.add(line);
136136
}
137137
return newLore;
138138
}

0 commit comments

Comments
 (0)