From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Allink Date: Sun, 10 Jul 2022 02:55:01 +0100 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 8e1b95371ed0bac1a4fff2d6550de118ba399650..e6d7b277b3b305d5069c73d9107c20ff11e34b7c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; +import net.kyori.adventure.text.format.NamedTextColor; // Scissors import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -2899,6 +2900,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl return; } + // Scissors start - Do not call events when the slot/button number is invalid + final int sentSlotNum = packet.getSlotNum(); + if((Mth.clamp(sentSlotNum, -1, this.player.containerMenu.slots.size() - 1) != sentSlotNum) && sentSlotNum != -999) + { + this.getCraftPlayer().kick( + net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)") + .color(NamedTextColor.RED) + ); + return; + } + // Scissors end + InventoryView inventory = this.player.containerMenu.getBukkitView(); SlotType type = inventory.getSlotType(packet.getSlotNum());