mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-01 04:37:09 +00:00
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Allink <arclicious@vivaldi.net>
|
||
|
|
Date: Sun, 10 Jul 2022 02:44:05 +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 b0bd0412010320cc624535d6abffe417a135a4dc..e8157a809ed2b018dfd155e8bc712a8c73aa79e6 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;
|
||
|
|
@@ -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
|
||
|
|
+
|
||
|
|
if (click == ClickType.NUMBER_KEY) {
|
||
|
|
event = new InventoryClickEvent(inventory, type, packet.getSlotNum(), click, action, packet.getButtonNum());
|
||
|
|
} else {
|