|
18 | 18 | package lol.hyper.toolstats.commands; |
19 | 19 |
|
20 | 20 | import lol.hyper.toolstats.ToolStats; |
| 21 | +import lol.hyper.toolstats.tools.ItemChecker; |
21 | 22 | import lol.hyper.toolstats.tools.UUIDDataType; |
22 | 23 | import net.kyori.adventure.platform.bukkit.BukkitAudiences; |
23 | 24 | import net.kyori.adventure.text.Component; |
24 | 25 | import net.kyori.adventure.text.format.NamedTextColor; |
25 | 26 | import org.bukkit.Material; |
26 | 27 | import org.bukkit.command.Command; |
27 | 28 | import org.bukkit.command.CommandSender; |
| 29 | +import org.bukkit.command.ConsoleCommandSender; |
28 | 30 | import org.bukkit.command.TabExecutor; |
29 | 31 | import org.bukkit.entity.Player; |
30 | 32 | import org.bukkit.inventory.ItemStack; |
@@ -71,15 +73,19 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command |
71 | 73 | audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED)); |
72 | 74 | return true; |
73 | 75 | } |
| 76 | + if (sender instanceof ConsoleCommandSender) { |
| 77 | + audiences.sender(sender).sendMessage(Component.text("You must be a player for this command.").color(NamedTextColor.RED)); |
| 78 | + return true; |
| 79 | + } |
74 | 80 | if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) { |
75 | 81 | if (!sender.hasPermission("toolstats.reset.confirm")) { |
76 | 82 | audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED)); |
77 | 83 | return true; |
78 | 84 | } |
79 | 85 | Player player = (Player) sender; |
80 | 86 | ItemStack heldItem = player.getInventory().getItemInMainHand(); |
81 | | - if (heldItem.getType() == Material.AIR) { |
82 | | - audiences.sender(sender).sendMessage(Component.text("You must hold an item!").color(NamedTextColor.RED)); |
| 87 | + if (ItemChecker.isValidItem(heldItem.getType())) { |
| 88 | + audiences.sender(sender).sendMessage(Component.text("You must hold a valid item.").color(NamedTextColor.RED)); |
83 | 89 | return true; |
84 | 90 | } |
85 | 91 | fixItemLore(heldItem, player); |
|
0 commit comments