Fix ConcurrentModificationException in PacketListenerSet (#3241)

dmulloy2 · Sep 23, 2024 · 3cb261f · 3cb261f
1 parent 7338183
commit 3cb261f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/comphenix/protocol/injector/collection/PacketListenerSet.java b/src/main/java/com/comphenix/protocol/injector/collection/PacketListenerSet.java
@@ -1,5 +1,6 @@
 package com.comphenix.protocol.injector.collection;
 
+import java.util.Iterator;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -45,7 +46,9 @@ public PacketListenerSet(PacketTypeListenerSet mainThreadPacketTypes, ErrorRepor
  public void addListener(PacketListener packetListener) {
  ListeningWhitelist listeningWhitelist = getListeningWhitelist(packetListener);
 
- for (PacketType packetType : listeningWhitelist.getTypes()) {
+ for (Iterator<PacketType> packet = listeningWhitelist.getTypes().iterator(); packet.hasNext();) {
+ PacketType packetType = packet.next();
+
  Set<PacketType> supportedPacketTypes = (packetType.getSender() == Sender.SERVER)
  ? PacketRegistry.getServerPacketTypes()
  : PacketRegistry.getClientPacketTypes();
@@ -56,7 +59,7 @@ public void addListener(PacketListener packetListener) {
  .build());
 
  // remove unknown packet types
- listeningWhitelist.getTypes().remove(packetType);
+ packet.remove();
  }
  }