diff --git a/patches/server/0035-Prevent-invalid-container-events.patch b/patches/server/0035-Prevent-invalid-container-events.patch
index 12c0e93..bda6675 100644
--- a/patches/server/0035-Prevent-invalid-container-events.patch
+++ b/patches/server/0035-Prevent-invalid-container-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0bd0412010320cc624535d6abffe417a135a4dc..e8157a809ed2b018dfd155e8bc712a8c73aa79e6 100644
+index b0bd0412010320cc624535d6abffe417a135a4dc..0d8d28a324b4bf093d7318be71eb67bb0dad9429 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -24,6 +24,8 @@ import java.util.function.UnaryOperator;
@@ -17,21 +17,23 @@ index b0bd0412010320cc624535d6abffe417a135a4dc..e8157a809ed2b018dfd155e8bc712a8c
  import net.minecraft.ChatFormatting;
  import net.minecraft.CrashReport;
  import net.minecraft.CrashReportCategory;
-@@ -2836,6 +2838,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-                     }
- 
-                     if (packet.getClickType() != net.minecraft.world.inventory.ClickType.QUICK_CRAFT) {
-+                        // Scissors start - Do not call events when the slot/button number is invalid
-+                        if(packet.getSlotNum() > 45)
-+                        {
-+                            this.getCraftPlayer().kick(
-+                                net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)")
-+                                    .color(NamedTextColor.RED)
-+                            );
-+                            return;
-+                        }
-+                        // Scissors end
+@@ -2642,6 +2644,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+     public void handleContainerClick(ServerboundContainerClickPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
+         if (this.player.isImmobile()) return; // CraftBukkit
 +
-                         if (click == ClickType.NUMBER_KEY) {
-                             event = new InventoryClickEvent(inventory, type, packet.getSlotNum(), click, action, packet.getButtonNum());
-                         } else {
++        // Scissors start - Do not call events when the slot/button number is invalid
++        final int sentSlotNum = packet.getSlotNum();
++        if(Mth.clamp(sentSlotNum, 0, 45) != sentSlotNum)
++        {
++            this.getCraftPlayer().kick(
++                net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)")
++                    .color(NamedTextColor.RED)
++                );
++                return;
++        }
++        // Scissors end
++
+         this.player.resetLastActionTime();
+         if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
+             boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if