Commit f5cdedcc authored by AnimeGitB's avatar AnimeGitB Committed by Melledy
Browse files

Fix logic error in remove command

parent efd7467a
...@@ -8,7 +8,6 @@ import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp; ...@@ -8,7 +8,6 @@ import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import static emu.grasscutter.utils.Language.translate; import static emu.grasscutter.utils.Language.translate;
...@@ -28,7 +27,9 @@ public class RemoveCommand implements CommandHandler { ...@@ -28,7 +27,9 @@ public class RemoveCommand implements CommandHandler {
for (String arg : args) { for (String arg : args) {
try { try {
int avatarIndex = Integer.parseInt(arg); int avatarIndex = Integer.parseInt(arg);
avatarIndexList.add(avatarIndex); if (!avatarIndexList.contains(avatarIndex)) {
avatarIndexList.add(avatarIndex);
}
} catch (Exception ignored) { } catch (Exception ignored) {
ignored.printStackTrace(); ignored.printStackTrace();
CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index")); CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
...@@ -36,7 +37,7 @@ public class RemoveCommand implements CommandHandler { ...@@ -36,7 +37,7 @@ public class RemoveCommand implements CommandHandler {
} }
} }
Collections.reverse(avatarIndexList); Collections.sort(avatarIndexList, Collections.reverseOrder());
for (int i = 0; i < avatarIndexList.size(); i++) { for (int i = 0; i < avatarIndexList.size(); i++) {
if (avatarIndexList.get(i) > targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIndexList.get(i) <= 0) { if (avatarIndexList.get(i) > targetPlayer.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIndexList.get(i) <= 0) {
......
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