Skip to content

Commit 2a3d5b4

Browse files
committed
do filter first
1 parent fabcd23 commit 2a3d5b4

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/QuickUsePotionPacket.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ public void onReceived(ExilePacketContext exilePacketContext) {
4343
}
4444
}
4545
potionItems.stream()
46+
//remove all in-cooldown potions
47+
.filter(x -> player.getCooldowns().isOnCooldown(x.getItem()))
4648
.map(x -> Pair.of(x, ((SlashPotionItem) x.getItem())))
4749
.collect(Collectors.groupingBy(x -> x.getRight().getType()))
48-
.entrySet()
50+
.values()
4951
.stream()
50-
.map((entry) -> {
51-
List<Pair<ItemStack, SlashPotionItem>> v = entry.getValue();
52+
.map(v -> {
5253
if (v.size() > 1) {
53-
List<Pair<ItemStack, SlashPotionItem>> sorted = v.stream().sorted(((p1, p2) -> -Float.compare(p1.getRight().getType().getHealPercent(p1.getKey()), p2.getRight().getType().getHealPercent(p2.getKey())))).toList();
54-
v.clear();
55-
v.add(sorted.get(0));
54+
List<Pair<ItemStack, SlashPotionItem>> sorted = v.stream()
55+
.sorted(((p1, p2) -> -Float.compare(p1.getRight().getType().getHealPercent(p1.getKey()), p2.getRight().getType().getHealPercent(p2.getKey()))))
56+
.toList();
57+
return sorted.get(0);
58+
} else {
59+
return v.get(0);
5660
}
57-
return entry.getValue().get(0);
61+
5862
})
59-
.forEach(x -> {
60-
if (!player.getCooldowns().isOnCooldown(x.getRight())) {
61-
x.getRight().handlePotionRestore(player, x.getLeft());
62-
}
63-
});
63+
.forEach(x -> x.getRight().handlePotionRestore(player, x.getLeft()));
6464
}
6565
}
6666

0 commit comments

Comments
 (0)