AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-10-31 20:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix container click patch (#46)

Browse Source
This commit is contained in:
Allink 2022-07-12 17:19:08 +01:00 committed by GitHub
parent ba694be2bc
commit f403924ca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/server/0035-Prevent-invalid-container-events.patch
View File

@ -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 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b0bd0412010320cc624535d6abffe417a135a4dc..0d8d28a324b4bf093d7318be71eb67bb0dad9429 100644 index b0bd0412010320cc624535d6abffe417a135a4dc..65e9791d7e613d039f93184cde717bff8e97000c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/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; @@ -24,6 +24,8 @@ import java.util.function.UnaryOperator;
@ -17,14 +17,21 @@ index b0bd0412010320cc624535d6abffe417a135a4dc..0d8d28a324b4bf093d7318be71eb67bb
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.CrashReport; import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory; import net.minecraft.CrashReportCategory;
@@ -2642,6 +2644,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -2642,6 +2644,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
public void handleContainerClick(ServerboundContainerClickPacket packet) { public void handleContainerClick(ServerboundContainerClickPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
if (this.player.isImmobile()) return; // CraftBukkit 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
@@ -2661,6 +2664,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
return;
}
+ // Scissors start - Do not call events when the slot/button number is invalid + // Scissors start - Do not call events when the slot/button number is invalid
+ final int sentSlotNum = packet.getSlotNum(); + final int sentSlotNum = packet.getSlotNum();
+ if(Mth.clamp(sentSlotNum, 0, 45) != sentSlotNum) + if((Mth.clamp(sentSlotNum, -1, this.player.containerMenu.slots.size() - 1) != sentSlotNum) && sentSlotNum != -999)
+ { + {
+ this.getCraftPlayer().kick( + this.getCraftPlayer().kick(
+ net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)") + net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)")
@ -34,6 +41,6 @@ index b0bd0412010320cc624535d6abffe417a135a4dc..0d8d28a324b4bf093d7318be71eb67bb
+ } + }
+ // Scissors end + // Scissors end
+ +
this.player.resetLastActionTime(); InventoryView inventory = this.player.containerMenu.getBukkitView();
if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit SlotType type = inventory.getSlotType(packet.getSlotNum());
boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if