40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Allink <arclicious@vivaldi.net>
|
|
Date: Sun, 10 Jul 2022 02:20:16 +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 ca595abe940463a62da033c7082c868c4c4b28d8..d6aa46443b0ec9b02259222d8ee9a7ff0cec4ae7 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;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
import javax.annotation.Nullable;
|
|
+
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
import net.minecraft.ChatFormatting;
|
|
import net.minecraft.CrashReport;
|
|
import net.minecraft.CrashReportCategory;
|
|
@@ -2593,6 +2595,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
|
|
+
|
|
+ // 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
|