From de7eb81ddfe6c92e8425468c22fa92b5daab3cf7 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Fri, 2 Dec 2022 17:49:04 +0100 Subject: [PATCH] Fixed 'silent' param in /mi give --- .../command/mmoitems/GiveCommandTreeNode.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GiveCommandTreeNode.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GiveCommandTreeNode.java index 66e99ad7..1f769909 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GiveCommandTreeNode.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GiveCommandTreeNode.java @@ -5,7 +5,6 @@ import io.lumine.mythic.lib.command.api.CommandTreeNode; import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmoitems.ItemStats; import net.Indyuce.mmoitems.MMOItems; -import net.Indyuce.mmoitems.util.MMOUtils; import net.Indyuce.mmoitems.api.Type; import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem; import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate; @@ -14,6 +13,7 @@ import net.Indyuce.mmoitems.api.util.RandomAmount; import net.Indyuce.mmoitems.api.util.message.Message; import net.Indyuce.mmoitems.command.MMOItemsCommandTreeRoot; import net.Indyuce.mmoitems.stat.data.SoulboundData; +import net.Indyuce.mmoitems.util.MMOUtils; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -60,7 +60,7 @@ public class GiveCommandTreeNode extends CommandTreeNode { double unidentify = args.length > 5 ? Double.parseDouble(args[5]) / 100 : 0; double drop = args.length > 6 ? Double.parseDouble(args[6]) / 100 : 1; double soulbound = args.length > 7 ? Double.parseDouble(args[7]) / 100 : 0; - boolean silent = args.length > 8 ? args[8].equalsIgnoreCase("silent") || args[8].equalsIgnoreCase("s") : false; + boolean silent = args.length > 8 && (args[8].equalsIgnoreCase("silent") || args[8].equalsIgnoreCase("s")); // roll drop chance if (random.nextDouble() > drop) @@ -83,13 +83,14 @@ public class GiveCommandTreeNode extends CommandTreeNode { item.setAmount(amount.getRandomAmount()); // message + if (!silent) { + Message.RECEIVED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(item), "#amount#", + (item.getAmount() > 1 ? " x" + item.getAmount() : "")).send(target); if (!sender.equals(target)) sender.sendMessage(MMOItems.plugin.getPrefix() + ChatColor.YELLOW + "Successfully gave " + ChatColor.GOLD + MMOUtils.getDisplayName(item) + (item.getAmount() > 1 ? " x" + item.getAmount() : "") + ChatColor.YELLOW + " to " + ChatColor.GOLD + target.getName() + ChatColor.YELLOW + "."); - if (!silent) - Message.RECEIVED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(item), "#amount#", - (item.getAmount() > 1 ? " x" + item.getAmount() : "")).send(target); + } // item new SmartGive(target).give(item);