mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-07-01 06:21:45 +00:00
871cc5653c
* Clean up command block event patch * Merge resource location patches * Merge map decoration patches * Merge Video's resource location patches * Merge large tag reset patches
47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Allink <arclicious@vivaldi.net>
|
|
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 6abdf9ac215fbe8015459258a6783d31e0a3933f..afc17ec86d12cefc30c2aabd86a04131f7dffdb6 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -30,6 +30,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;
|
|
@@ -2988,6 +2990,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
public void handleContainerClick(ServerboundContainerClickPacket packet) {
|
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
|
|
if (this.player.isImmobile()) return; // CraftBukkit
|
|
+
|
|
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
|
|
@@ -3009,6 +3012,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
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());
|
|
|