diff --git a/src/main/java/emu/lunarcore/command/commands/ClearCommand.java b/src/main/java/emu/lunarcore/command/commands/ClearCommand.java index 3cf418d..a44e736 100644 --- a/src/main/java/emu/lunarcore/command/commands/ClearCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/ClearCommand.java @@ -24,17 +24,19 @@ public class ClearCommand implements CommandHandler { List toRemove = new LinkedList<>(); String type = args.get(0).toLowerCase(); + int filterLevel = Math.max(args.getLevel(), 1); + switch (type) { case "relics", "r" -> { for (GameItem item : args.getTarget().getInventory().getItems().values()) { - if (item.getItemMainType() == ItemMainType.Relic && item.getLevel() <= 1 && item.getExp() == 0 && !item.isLocked() && !item.isEquipped()) { + if (item.getItemMainType() == ItemMainType.Relic && item.getLevel() <= filterLevel && !item.isLocked() && !item.isEquipped()) { toRemove.add(item); } } } case "equipment", "lightcones", "lc" -> { for (GameItem item : args.getTarget().getInventory().getItems().values()) { - if (item.getItemMainType() == ItemMainType.Equipment && item.getLevel() <= 1 && item.getExp() == 0 && !item.isLocked() && !item.isEquipped()) { + if (item.getItemMainType() == ItemMainType.Equipment && item.getLevel() <= filterLevel && !item.isLocked() && !item.isEquipped()) { toRemove.add(item); } }