fix: Cancel outbound PacketEvents packets, close #344

WiIIiam278 · Aug 9, 2024 · 0c5a42a · 0c5a42a
1 parent 75a2378
commit 0c5a42a
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/...rc/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java b/...rc/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java
@@ -23,6 +23,7 @@
 import com.github.retrooper.packetevents.event.PacketListenerAbstract;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.google.common.collect.Sets;
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
@@ -78,7 +79,20 @@ public PlayerPacketAdapter(@NotNull BukkitPacketEventsLockedPacketListener liste
 
         @Override
         public void onPacketReceive(PacketReceiveEvent event) {
-            if(!(event.getPacketType() instanceof PacketType.Play.Client client)) {
+            if (!(event.getPacketType() instanceof PacketType.Play.Client client)) {
+                return;
+            }
+            if (!CANCEL_PACKETS.contains(client)) {
+                return;
+            }
+            if (listener.cancelPlayerEvent(event.getUser().getUUID())) {
+                event.setCancelled(true);
+            }
+        }
+
+        @Override
+        public void onPacketSend(PacketSendEvent event) {
+            if (!(event.getPacketType() instanceof PacketType.Play.Client client)) {
                 return;
             }
             if (!CANCEL_PACKETS.contains(client)) {