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

Commit

Permalink
MessageBuilder: fix display item name
Browse files Browse the repository at this point in the history
  • Loading branch information
TheFaser committed Aug 26, 2023
1 parent 4bae04e commit 1c3771b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private String formatMessage(String message, Player player, FDamager fDamager) {
String byItemMessage = locale.getFormatString("death.by-item", null);

String itemName = killerItem.getItemMeta() != null && !killerItem.getItemMeta().getDisplayName().isEmpty()
? killerItem.getItemMeta().getDisplayName()
? net.md_5.bungee.api.ChatColor.ITALIC + killerItem.getItemMeta().getDisplayName()
: killerItem.getType().name();

message = message.replace("<by_item>", byItemMessage.replace("<item>", itemName));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/flectone/messages/MessageBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ public MessageBuilder(@NotNull String command, @NotNull String text, @Nullable C

if (itemStack != null && word.equalsIgnoreCase("%item%")) {
wordParams.setItem(true);
wordParams.setText("\uD83D\uDD32");
wordParams.setText(itemStack.getItemMeta() != null && !itemStack.getItemMeta().getDisplayName().isEmpty()
? net.md_5.bungee.api.ChatColor.ITALIC + itemStack.getItemMeta().getDisplayName()
: itemStack.getType().name());
return wordParams;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/flectone/utils/NMSUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class NMSUtil {
public static String getCorrectlyName(ItemStack itemStack) {
return itemStack.getItemMeta() == null || itemStack.getItemMeta().getDisplayName().isEmpty()
? getMinecraftName(itemStack)
: itemStack.getItemMeta().getDisplayName();
: net.md_5.bungee.api.ChatColor.ITALIC + itemStack.getItemMeta().getDisplayName();
}

public static String getMinecraftName(ItemStack is) {
Expand Down

0 comments on commit 1c3771b

Please sign in to comment.