Skip to content

Commit dceb205

Browse files
authored
Fix type mismatch in AutoArmor, aura leak in AutoEat, stale packets in Blink (#6443)
1 parent ac001de commit dceb205

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoArmor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public void calculate() {
281281
Utils.getEnchantments(itemStack, enchantments);
282282

283283
// Return if current armor piece has Curse of Binding
284-
if (enchantments.containsKey(Enchantments.BINDING_CURSE)) {
284+
if (enchantments.keySet().stream().anyMatch(e -> e.is(Enchantments.BINDING_CURSE))) {
285285
score = Integer.MAX_VALUE; // Setting score to Integer.MAX_VALUE so its now swapped later
286286
return;
287287
}
@@ -316,7 +316,7 @@ else if (antiBreak.get() && durability <= 10) {
316316

317317
private int decreaseScoreByAvoidedEnchantments(int score) {
318318
for (ResourceKey<Enchantment> enchantment : avoidedEnchantments.get()) {
319-
score -= 2 * enchantments.getInt(enchantment);
319+
score -= 2 * Utils.getEnchantmentLevel(enchantments, enchantment);
320320
}
321321

322322
return score;

src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ private void onJoinGame(GameJoinedEvent event) {
139139

140140
@EventHandler
141141
private void onLeaveGame(GameLeftEvent event) {
142-
onDeactivate();
142+
dumpPackets(false);
143+
cancelled = false;
143144
}
144145

145146
@Override

src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class AutoEat extends Module {
5555
Items.SUSPICIOUS_STEW
5656
)
5757
.filter(Utils::isFood)
58-
.bypassFilterWhenSavingAndLoading()
58+
.bypassFilterWhenSavingAndLoading()
5959
.build()
6060
);
6161

@@ -179,6 +179,7 @@ private void onItemUseCrosshairTarget(ItemUseCrosshairTargetEvent event) {
179179
private void startEating() {
180180
prevSlot = mc.player.getInventory().getSelectedSlot();
181181
eat();
182+
if (!eating) return;
182183

183184
// Pause auras
184185
wasAura.clear();
@@ -325,8 +326,8 @@ private int findBestFood(int start, int end) {
325326
}
326327

327328
public enum ThresholdMode {
328-
Health((health, hunger) -> health),
329-
Hunger((health, hunger) -> hunger),
329+
Health((health, _) -> health),
330+
Hunger((_, hunger) -> hunger),
330331
Any((health, hunger) -> health || hunger),
331332
Both((health, hunger) -> health && hunger);
332333

0 commit comments

Comments
 (0)