mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2024-06-26 14:24:45 +02:00
Don't automatically add prefix to certain messages
This commit is contained in:
parent
2be9207faa
commit
f825995a85
|
@ -495,6 +495,19 @@ public class MaterialUtil {
|
||||||
* @param stock The items in stock
|
* @param stock The items in stock
|
||||||
*/
|
*/
|
||||||
public static boolean sendMessage(Player player, String playerName, Messages.Message message, ItemStack[] stock, Map<String, String> replacementMap, String... replacements) {
|
public static boolean sendMessage(Player player, String playerName, Messages.Message message, ItemStack[] stock, Map<String, String> 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<String, String> replacementMap, String... replacements) {
|
||||||
if (showItem == null) {
|
if (showItem == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -514,7 +527,7 @@ public class MaterialUtil {
|
||||||
Component component = new Replacer()
|
Component component = new Replacer()
|
||||||
.placeholderSuffix("")
|
.placeholderSuffix("")
|
||||||
.replace("item",itemComponent.build())
|
.replace("item",itemComponent.build())
|
||||||
.replaceIn(message.getComponent(player, true, newMap, replacements));
|
.replaceIn(message.getComponent(player, showPrefix, newMap, replacements));
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
ChestShop.getAudiences().player(player).sendMessage(component);
|
ChestShop.getAudiences().player(player).sendMessage(component);
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class ItemInfo implements CommandExecutor {
|
||||||
try {
|
try {
|
||||||
Map<String, String> replacementMap = ImmutableMap.of("item", ItemUtil.getName(item));
|
Map<String, String> replacementMap = ImmutableMap.of("item", ItemUtil.getName(item));
|
||||||
if (!Properties.SHOWITEM_MESSAGE || !(sender instanceof Player)
|
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);
|
Messages.iteminfo_fullname.send(sender, replacementMap);
|
||||||
}
|
}
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class ShopInfoListener implements Listener {
|
||||||
"quantity", String.valueOf(amount)
|
"quantity", String.valueOf(amount)
|
||||||
);
|
);
|
||||||
if (!Properties.SHOWITEM_MESSAGE
|
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);
|
Messages.shopinfo.send(event.getSender(), replacementMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user