Skip to content

GitLab

Commit e1c0b4a9 authored by yangjiahao's avatar yangjiahao Committed by memetrollsXD
Browse files

改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。

parent 352801b8
Hide whitespace changes
Inline Side-by-side
src/main/java/emu/grasscutter/command/commands/ClearCommand.java
View file @ e1c0b4a9
...@@ -18,79 +18,86 @@ public final class ClearCommand implements CommandHandler { ...@@ -18,79 +18,86 @@ public final class ClearCommand implements CommandHandler {
@Override @Override
public void execute(Player sender, List<String> args) { public void execute(Player sender, List<String> args) {
int target; int target;
String cmdSwitch = "";
if (sender == null) { if (sender == null) {
CommandHandler.sendMessage(null, "Run this command in-game."); CommandHandler.sendMessage(null, "Run this command in-game.");
return; return;
} }
String cmdSwitch = args.get(1);
Inventory playerInventory = sender.getInventory(); Inventory playerInventory = sender.getInventory();
try { try {
if (args.size() == 1) {
cmdSwitch = args.get(0);
target = sender.getUid();
}else {
cmdSwitch = args.get(1);
target = Integer.parseInt(args.get(0)); target = Integer.parseInt(args.get(0));
Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); }
if (targetPlayer == null) { Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
target = sender.getUid(); switch (cmdSwitch) {
} else { case "wp" -> {
switch (cmdSwitch) { playerInventory.getItems().values().stream()
case "wp" -> { .filter(item -> item.getItemType() == ItemType.ITEM_WEAPON)
playerInventory.getItems().values().stream() .filter(item -> !item.isLocked() && !item.isEquipped())
.filter(item -> item.getItemType() == ItemType.ITEM_WEAPON) .forEach(item -> playerInventory.removeItem(item, item.getCount()));
.filter(item -> !item.isLocked() && !item.isEquipped()) sender.dropMessage("Cleared weapons for " + targetPlayer.getNickname() + " .");
.forEach(item -> playerInventory.removeItem(item, item.getCount())); }
sender.dropMessage("Cleared weapons for " + targetPlayer.getNickname() + " ."); case "art" -> {
} playerInventory.getItems().values().stream()
case "art" -> { .filter(item -> item.getItemType() == ItemType.ITEM_RELIQUARY)
playerInventory.getItems().values().stream() .filter(item -> item.getLevel() == 1 && item.getExp() == 0)
.filter(item -> item.getItemType() == ItemType.ITEM_RELIQUARY) .filter(item -> !item.isLocked() && !item.isEquipped())
.filter(item -> item.getLevel() == 1 && item.getExp() == 0) .forEach(item -> playerInventory.removeItem(item, item.getCount()));
.filter(item -> !item.isLocked() && !item.isEquipped()) sender.dropMessage("Cleared artifacts for " + targetPlayer.getNickname() + " .");
.forEach(item -> playerInventory.removeItem(item, item.getCount())); }
sender.dropMessage("Cleared artifacts for " + targetPlayer.getNickname() + " ."); case "mat" -> {
} playerInventory.getItems().values().stream()
case "mat" -> { .filter(item -> item.getItemType() == ItemType.ITEM_MATERIAL)
playerInventory.getItems().values().stream() .filter(item -> item.getLevel() == 1 && item.getExp() == 0)
.filter(item -> item.getItemType() == ItemType.ITEM_MATERIAL) .filter(item -> !item.isLocked() && !item.isEquipped())
.filter(item -> item.getLevel() == 1 && item.getExp() == 0) .forEach(item -> playerInventory.removeItem(item, item.getCount()));
.filter(item -> !item.isLocked() && !item.isEquipped()) sender.dropMessage("Cleared artifacts for " + targetPlayer.getNickname() + " .");
.forEach(item -> playerInventory.removeItem(item, item.getCount())); }
sender.dropMessage("Cleared artifacts for " + targetPlayer.getNickname() + " ."); case "all" -> {
} playerInventory.getItems().values().stream()
case "all" -> { .filter(item1 -> item1.getItemType() == ItemType.ITEM_RELIQUARY)
playerInventory.getItems().values().stream() .filter(item1 -> item1.getLevel() == 1 && item1.getExp() == 0)
.filter(item1 -> item1.getItemType() == ItemType.ITEM_RELIQUARY) .filter(item1 -> !item1.isLocked() && !item1.isEquipped())
.filter(item1 -> item1.getLevel() == 1 && item1.getExp() == 0) .forEach(item1 -> playerInventory.removeItem(item1, item1.getCount()));
.filter(item1 -> !item1.isLocked() && !item1.isEquipped()) sender.dropMessage("Cleared artifacts for " + targetPlayer.getNickname() + " .");
.forEach(item1 -> playerInventory.removeItem(item1, item1.getCount())); playerInventory.getItems().values().stream()
playerInventory.getItems().values().stream() .filter(item2 -> item2.getItemType() == ItemType.ITEM_MATERIAL)
.filter(item2 -> item2.getItemType() == ItemType.ITEM_MATERIAL) .filter(item2 -> !item2.isLocked() && !item2.isEquipped())
.filter(item2 -> !item2.isLocked() && !item2.isEquipped()) .forEach(item2 -> playerInventory.removeItem(item2, item2.getCount()));
.forEach(item2 -> playerInventory.removeItem(item2, item2.getCount())); sender.dropMessage("Cleared materials for " + targetPlayer.getNickname() + " .");
playerInventory.getItems().values().stream() playerInventory.getItems().values().stream()
.filter(item3 -> item3.getItemType() == ItemType.ITEM_WEAPON) .filter(item3 -> item3.getItemType() == ItemType.ITEM_WEAPON)
.filter(item3 -> item3.getLevel() == 1 && item3.getExp() == 0) .filter(item3 -> item3.getLevel() == 1 && item3.getExp() == 0)
.filter(item3 -> !item3.isLocked() && !item3.isEquipped()) .filter(item3 -> !item3.isLocked() && !item3.isEquipped())
.forEach(item3 -> playerInventory.removeItem(item3, item3.getCount())); .forEach(item3 -> playerInventory.removeItem(item3, item3.getCount()));
playerInventory.getItems().values().stream() sender.dropMessage("Cleared weapons for " + targetPlayer.getNickname() + " .");
.filter(item4 -> item4.getItemType() == ItemType.ITEM_FURNITURE) playerInventory.getItems().values().stream()
.filter(item4 -> !item4.isLocked() && !item4.isEquipped()) .filter(item4 -> item4.getItemType() == ItemType.ITEM_FURNITURE)
.forEach(item4 -> playerInventory.removeItem(item4, item4.getCount())); .filter(item4 -> !item4.isLocked() && !item4.isEquipped())
playerInventory.getItems().values().stream() .forEach(item4 -> playerInventory.removeItem(item4, item4.getCount()));
.filter(item5 -> item5.getItemType() == ItemType.ITEM_DISPLAY) sender.dropMessage("Cleared furniture for " + targetPlayer.getNickname() + " .");
.filter(item5 -> !item5.isLocked() && !item5.isEquipped()) playerInventory.getItems().values().stream()
.forEach(item5 -> playerInventory.removeItem(item5, item5.getCount())); .filter(item5 -> item5.getItemType() == ItemType.ITEM_DISPLAY)
playerInventory.getItems().values().stream() .filter(item5 -> !item5.isLocked() && !item5.isEquipped())
.filter(item6 -> item6.getItemType() == ItemType.ITEM_VIRTUAL) .forEach(item5 -> playerInventory.removeItem(item5, item5.getCount()));
.filter(item6 -> !item6.isLocked() && !item6.isEquipped()) sender.dropMessage("Cleared displays for " + targetPlayer.getNickname() + " .");
.forEach(item6 -> playerInventory.removeItem(item6, item6.getCount())); playerInventory.getItems().values().stream()
sender.dropMessage("Cleared everything for " + targetPlayer.getNickname() + " ."); .filter(item6 -> item6.getItemType() == ItemType.ITEM_VIRTUAL)
} .filter(item6 -> !item6.isLocked() && !item6.isEquipped())
} .forEach(item6 -> playerInventory.removeItem(item6, item6.getCount()));
sender.dropMessage("Cleared virtuals for " + targetPlayer.getNickname() + " .");
sender.dropMessage("Cleared everything for " + targetPlayer.getNickname() + " .");
} }
} catch (NumberFormatException ignored) {
// TODO: Parse from item name using GM Handbook.
CommandHandler.sendMessage(sender, "Invalid playerId.");
return;
} }
} catch (NumberFormatException ignored) {
// TODO: Parse from item name using GM Handbook.
CommandHandler.sendMessage(sender, "Invalid playerId.");
return;
}
Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target); Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if (targetPlayer == null) { if (targetPlayer == null) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment