diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java index 7464010..4b31560 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java @@ -495,6 +495,19 @@ public class MaterialUtil { * @param stock The items in stock */ public static boolean sendMessage(Player player, String playerName, Messages.Message message, ItemStack[] stock, Map replacementMap, String... replacements) { + return sendMessage(player, playerName, message, true, stock, replacementMap, replacements); + } + + /** + * Send a message with hover info and icons + * + * @param player The player to send the message to + * @param playerName The name of the player in case he is offline and bungee messages are enabled + * @param message The raw message + * @param showPrefix If the prefix should show + * @param stock The items in stock + */ + public static boolean sendMessage(Player player, String playerName, Messages.Message message, boolean showPrefix, ItemStack[] stock, Map replacementMap, String... replacements) { if (showItem == null) { return false; } @@ -514,7 +527,7 @@ public class MaterialUtil { Component component = new Replacer() .placeholderSuffix("") .replace("item",itemComponent.build()) - .replaceIn(message.getComponent(player, true, newMap, replacements)); + .replaceIn(message.getComponent(player, showPrefix, newMap, replacements)); if (player != null) { ChestShop.getAudiences().player(player).sendMessage(component); return true; diff --git a/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java b/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java index 5841462..279e92f 100644 --- a/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java +++ b/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java @@ -51,7 +51,7 @@ public class ItemInfo implements CommandExecutor { try { Map replacementMap = ImmutableMap.of("item", ItemUtil.getName(item)); if (!Properties.SHOWITEM_MESSAGE || !(sender instanceof Player) - || !MaterialUtil.Show.sendMessage((Player) sender, Messages.iteminfo_fullname, new ItemStack[]{item}, replacementMap)) { + || !MaterialUtil.Show.sendMessage((Player) sender, sender.getName(), Messages.iteminfo_fullname, false, new ItemStack[]{item}, replacementMap)) { Messages.iteminfo_fullname.send(sender, replacementMap); } } catch (IllegalArgumentException e) { diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/ShopInfoListener.java b/src/main/java/com/Acrobot/ChestShop/Listeners/ShopInfoListener.java index 5c4cc3d..98099f9 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/ShopInfoListener.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/ShopInfoListener.java @@ -77,7 +77,7 @@ public class ShopInfoListener implements Listener { "quantity", String.valueOf(amount) ); if (!Properties.SHOWITEM_MESSAGE - || !MaterialUtil.Show.sendMessage(event.getSender(), Messages.shopinfo, new ItemStack[]{item}, replacementMap)) { + || !MaterialUtil.Show.sendMessage(event.getSender(), event.getSender().getName(), Messages.shopinfo, false, new ItemStack[]{item}, replacementMap)) { Messages.shopinfo.send(event.getSender(), replacementMap); }