style: rename BadPacketsW to BadPacketsV

GrimAnticheat · Apr 16, 2024 · 2858cb9 · 2858cb9
1 parent e74f494
commit 2858cb9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...c/checks/impl/badpackets/BadPacketsW.java → ...c/checks/impl/badpackets/BadPacketsV.java b/...c/checks/impl/badpackets/BadPacketsW.java → ...c/checks/impl/badpackets/BadPacketsV.java
@@ -7,18 +7,16 @@
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.item.ItemStack;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 
-@CheckData(name = "BadPacketsW", experimental = true)
-public class BadPacketsW extends Check implements PacketCheck {
-    public BadPacketsW(GrimPlayer player) {
+@CheckData(name = "BadPacketsV", experimental = true)
+public class BadPacketsV extends Check implements PacketCheck {
+    public BadPacketsV(GrimPlayer player) {
         super(player);
     }
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
-        if (player.getClientVersion().isOlderThan(ClientVersion.V_1_9)) return;
         if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
             WrapperPlayClientInteractEntity interactEntity = new WrapperPlayClientInteractEntity(event);
             if (interactEntity.getAction() != WrapperPlayClientInteractEntity.InteractAction.ATTACK) return;

diff --git a/src/main/java/ac/grim/grimac/manager/CheckManager.java b/src/main/java/ac/grim/grimac/manager/CheckManager.java
@@ -88,7 +88,7 @@ public CheckManager(GrimPlayer player) {
                 .put(BadPacketsS.class, new BadPacketsS(player))
                 .put(BadPacketsT.class, new BadPacketsT(player))
                 .put(BadPacketsU.class, new BadPacketsU(player))
-                .put(BadPacketsW.class, new BadPacketsW(player))
+                .put(BadPacketsV.class, new BadPacketsV(player))
                 .put(FastBreak.class, new FastBreak(player))
                 .put(TransactionOrder.class, new TransactionOrder(player))
                 .put(NoSlowB.class, new NoSlowB(player))

diff --git a/src/main/java/ac/grim/grimac/utils/latency/CompensatedInventory.java b/src/main/java/ac/grim/grimac/utils/latency/CompensatedInventory.java
@@ -108,7 +108,7 @@ private void markPlayerSlotAsChanged(int clicked) {
     }
 
     public ItemStack getItemInHand(InteractionHand hand) {
-        return hand == InteractionHand.MAIN_HAND ? getByEquipmentType(EquipmentType.MAINHAND) : getByEquipmentType(EquipmentType.OFFHAND);
+        return hand == InteractionHand.MAIN_HAND ? getHeldItem() : getOffHand();
     }
 
     private void markServerForChangingSlot(int clicked, int windowID) {