From b4343c064e2256b167eddccf0796eec01848f469 Mon Sep 17 00:00:00 2001
From: cookiedragon234 <c.o.okiedragon234@gmail.com>
Date: Fri, 10 Apr 2020 17:41:30 +0100
Subject: [PATCH] Cleaner and faster packet cancel

---
 .../module/modules/player/PacketCancel.java   | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/PacketCancel.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/PacketCancel.java
index b0b750d5d..8f47c9295 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/player/PacketCancel.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/PacketCancel.java
@@ -23,39 +23,34 @@ public class PacketCancel extends Module {
     private final Setting<Boolean> packetEntityAction = register(Settings.booleanBuilder("CPacketEntityAction").withValue(true).withVisibility(v -> !all.getValue()));
     private final Setting<Boolean> packetUseEntity = register(Settings.booleanBuilder("CPacketUseEntity").withValue(true).withVisibility(v -> !all.getValue()));
     private final Setting<Boolean> packetVehicleMove = register(Settings.booleanBuilder("CPacketVehicleMove").withValue(true).withVisibility(v -> !all.getValue()));
-
-    Queue<Packet> packets = new LinkedList<>();
+    private int numPackets;
+    
     @EventHandler
     private final Listener<PacketEvent.Send> sendListener = new Listener<>(event -> {
-        if (all.getValue() && event.getPacket() != null) event.cancel();
-        if (packetInput.getValue() && event.getPacket() instanceof CPacketInput) {
+        if (
+            (all.getValue())
+            ||
+            (packetInput.getValue() && event.getPacket() instanceof CPacketInput)
+            ||
+            (packetPlayer.getValue() && event.getPacket() instanceof CPacketPlayer)
+            ||
+            (packetEntityAction.getValue() && event.getPacket() instanceof CPacketEntityAction)
+            ||
+            (packetUseEntity.getValue() && event.getPacket() instanceof CPacketUseEntity)
+            ||
+            (packetVehicleMove.getValue() && event.getPacket() instanceof CPacketVehicleMove)
+        ) {
             event.cancel();
-            packets.add(event.getPacket());
-        }
-        if (packetPlayer.getValue() && event.getPacket() instanceof CPacketPlayer) {
-            event.cancel();
-            packets.add(event.getPacket());
-        }
-        if (packetEntityAction.getValue() && event.getPacket() instanceof CPacketEntityAction) {
-            event.cancel();
-            packets.add(event.getPacket());
-        }
-        if (packetUseEntity.getValue() && event.getPacket() instanceof CPacketUseEntity) {
-            event.cancel();
-            packets.add(event.getPacket());
-        }
-        if (packetVehicleMove.getValue() && event.getPacket() instanceof CPacketVehicleMove) {
-            event.cancel();
-            packets.add(event.getPacket());
+            numPackets++;
         }
     });
 
     public void onDisable() {
-        packets.clear();
+        numPackets = 0;
     }
 
     @Override
     public String getHudInfo() {
-        return String.valueOf(packets.size());
+        return Integer.toString(numPackets);
     }
 }