Merge pull request #1464 from ManInMyVan/bpY

add BadPacketsY

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsY.java

@@ -0,0 +1,32 @@
+package ac.grim.grimac.checks.impl.badpackets;
+
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.CheckData;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.player.GrimPlayer;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientHeldItemChange;
+
+/**
+ * Checks for out of bounds slot changes
+ */
+@CheckData(name = "BadPacketsY")
+public class BadPacketsY extends Check implements PacketCheck {
+    public BadPacketsY(GrimPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void onPacketReceive(PacketReceiveEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
+            final int slot = new WrapperPlayClientHeldItemChange(event).getSlot();
+            if (slot > 8 || slot < 0) { // ban
+                if (flagAndAlert("slot="+slot) && shouldModifyPackets()) {
+                    event.setCancelled(true);
+                    player.onPacketCancel();
+                }
+            }
+        }
+    }
+}

src/main/java/ac/grim/grimac/events/packets/PacketPlayerDigging.java

@@ -151,10 +151,10 @@ public void onPacketReceive(PacketReceiveEvent event) {
         }
 
         if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
-            int slot = new WrapperPlayClientHeldItemChange(event).getSlot();
+            final int slot = new WrapperPlayClientHeldItemChange(event).getSlot();
 
             // Stop people from spamming the server with out of bounds exceptions
-            if (slot > 8) return;
+            if (slot > 8 || slot < 0) return;
 
             final GrimPlayer player = GrimAPI.INSTANCE.getPlayerDataManager().getPlayer(event.getUser());
             if (player == null) return;

src/main/java/ac/grim/grimac/manager/CheckManager.java

@@ -91,6 +91,7 @@ public CheckManager(GrimPlayer player) {
                 .put(BadPacketsV.class, new BadPacketsV(player))
                 .put(BadPacketsW.class, new BadPacketsW(player))
                 .put(BadPacketsX.class, new BadPacketsX(player))
+                .put(BadPacketsY.class, new BadPacketsY(player))
                 .put(FastBreak.class, new FastBreak(player))
                 .put(TransactionOrder.class, new TransactionOrder(player))
                 .put(NoSlowB.class, new NoSlowB(player))

src/main/java/ac/grim/grimac/utils/latency/CompensatedInventory.java

@@ -263,12 +263,12 @@ public void onPacketReceive(final PacketReceiveEvent event) {
         }
 
         if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
-            WrapperPlayClientHeldItemChange slot = new WrapperPlayClientHeldItemChange(event);
+            final int slot = new WrapperPlayClientHeldItemChange(event).getSlot();
 
             // Stop people from spamming the server with an out-of-bounds exception
-            if (slot.getSlot() > 8) return;
+            if (slot > 8 || slot < 0) return;
 
-            inventory.selected = slot.getSlot();
+            inventory.selected = slot;
         }
 
         if (event.getPacketType() == PacketType.Play.Client.CREATIVE_INVENTORY_ACTION) {