From c295e47940aeed0b913d3836973e410ba422aab1 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sat, 5 Feb 2022 17:12:00 -0500
Subject: [PATCH] Ensure inventory affected slot is added in MOVE_TO_HOTBAR
 actions

---
 .../java/org/geysermc/geyser/inventory/click/ClickPlan.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java b/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java
index e6eeea689..45d535167 100644
--- a/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/click/ClickPlan.java
@@ -28,6 +28,7 @@ package org.geysermc.geyser.inventory.click;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
 import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType;
 import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
+import com.github.steveice10.mc.protocol.data.game.inventory.MoveToHotbarAction;
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClickPacket;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -381,6 +382,10 @@ public final class ClickPlan {
         for (ClickAction action : plan) {
             if (translator.getSlotType(action.slot) == SlotType.NORMAL && action.slot != Click.OUTSIDE_SLOT) {
                 affectedSlots.add(action.slot);
+                if (action.click.actionType == ContainerActionType.MOVE_TO_HOTBAR_SLOT) {
+                    //TODO won't work if offhand is added
+                    affectedSlots.add(inventory.getOffsetForHotbar(((MoveToHotbarAction) action.click.action).ordinal()));
+                }
             }
         }
         return affectedSlots;