Skip to content

Commit 50a0bc8

Browse files
committed
small command changes
1 parent 583cd82 commit 50a0bc8

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
package lol.hyper.toolstats.commands;
1919

2020
import lol.hyper.toolstats.ToolStats;
21+
import lol.hyper.toolstats.tools.ItemChecker;
2122
import lol.hyper.toolstats.tools.UUIDDataType;
2223
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
2324
import net.kyori.adventure.text.Component;
2425
import net.kyori.adventure.text.format.NamedTextColor;
2526
import org.bukkit.Material;
2627
import org.bukkit.command.Command;
2728
import org.bukkit.command.CommandSender;
29+
import org.bukkit.command.ConsoleCommandSender;
2830
import org.bukkit.command.TabExecutor;
2931
import org.bukkit.entity.Player;
3032
import org.bukkit.inventory.ItemStack;
@@ -71,15 +73,19 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
7173
audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
7274
return true;
7375
}
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+
}
7480
if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
7581
if (!sender.hasPermission("toolstats.reset.confirm")) {
7682
audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
7783
return true;
7884
}
7985
Player player = (Player) sender;
8086
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));
8389
return true;
8490
}
8591
fixItemLore(heldItem, player);

0 commit comments

Comments
 (0)