Skip to content

Remove wrong clickStack check in MoveToHotbarSlot #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfresh2 merged 4 commits into from
Mar 15, 2026
Merged

Remove wrong clickStack check in MoveToHotbarSlot #267

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
855fe68
Remove wrong clickStack check in MoveToHotbarSlot
IceTank Mar 11, 2026
222056e
Update MoveToHotbarSlot to only reject swap packets if both item stac…
IceTank Mar 14, 2026
fdc25ec
Refactored and simplified code
IceTank Mar 15, 2026
00a65d9
Fix lint
IceTank Mar 15, 2026
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
24 changes: 11 additions & 13 deletions src/main/java/com/zenith/feature/inventory/actions/MoveToHotbarSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ public MinecraftPacket packet() {
CLIENT_LOG.debug("Can't move to hotbar, mouse stack is not empty: {}", this);
return null; // can't swap if mouse stack is not empty
}
final ItemStack clickStack = container.getItemStack(slotId);
if (isStackEmpty(clickStack)) {
CLIENT_LOG.debug("{} Can't swap empty stack", this);
return null; // can't swap if clickStack is empty
}
Int2ObjectMap<ItemStack> changedSlots = new Int2ObjectArrayMap<>();
int hotBarSlot = -1;
boolean playerInv = containerId == 0;
Expand All @@ -55,16 +50,19 @@ public MinecraftPacket packet() {
return null;
}
}
if (hotBarSlot != -1) {
final ItemStack swapStack = container.getItemStack(hotBarSlot);
final ItemStack clickStack = container.getItemStack(slotId);
final ItemStack swapStack = hotBarSlot == -1
? CACHE.getPlayerCache().getEquipment(EquipmentSlot.OFF_HAND)
: container.getItemStack(hotBarSlot);
if (isStackEmpty(clickStack) && isStackEmpty(swapStack)) {
CLIENT_LOG.debug("{} Can't swap two empty stacks with each other", this);
return null; // can't swap if clickStack and swapStack is empty
}
if (hotBarSlot != -1) { // -1 == Swapping with offhand while in a container
changedSlots.put(hotBarSlot, clickStack);
changedSlots.put(slotId, swapStack);
} else {
// there is no offhand slot id in the container, so only one slot is set as changed in the packet
var offhandStack = CACHE.getPlayerCache().getEquipment(EquipmentSlot.OFF_HAND);
changedSlots.put(slotId, offhandStack);
}

// there is no offhand slot id in the container, so only one slot is set as changed in the packet
changedSlots.put(slotId, swapStack);

return new ServerboundContainerClickPacket(
containerId,
Expand Down
Loading