Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Comment thread
31a05b9c marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.modules.combat.AutoTotem;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.player.SlotUtils;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -151,6 +152,10 @@ private void checkSlot(int slot, ItemStack stack) {
fromSlot = findItem(prevStack, slot, 1);
}

// eliminate occasional loops when moving items from hotbar to itself
if (fromSlot == mc.player.getInventory().getSelectedSlot()) return;
if ((fromSlot < 9 || fromSlot == SlotUtils.OFFHAND) && fromSlot < slot && slot != mc.player.getInventory().getSelectedSlot()) return;

InvUtils.move().from(fromSlot).to(slot);
}

Expand All @@ -164,7 +169,7 @@ private int findItem(ItemStack lookForStack, int excludedSlot, int goodEnoughCou
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.getItem() != lookForStack.getItem()) continue;

if (sameEnchants.get() && !stack.getEnchantments().equals(lookForStack.getEnchantments())) continue;
if (sameEnchants.get() && !stack.getComponents().equals(lookForStack.getComponents())) continue;
Comment thread
31a05b9c marked this conversation as resolved.
Outdated

if (stack.getCount() > count) {
slot = i;
Expand Down