Prevent CME when adding players' emotes (GeyserMC#1831)

bundabrg · Jan 12, 2021 · af405f3 · af405f3
1 parent fb283fc
commit af405f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -370,7 +370,9 @@ public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServ
 
         this.inventoryCache.getInventories().put(0, inventory);
 
-        connector.getPlayers().forEach(player -> this.emotes.addAll(player.getEmotes()));
+        // Make a copy to prevent ConcurrentModificationException
+        final List<GeyserSession> tmpPlayers = new ArrayList<>(connector.getPlayers());
+        tmpPlayers.forEach(player -> this.emotes.addAll(player.getEmotes()));
 
         bedrockServerSession.addDisconnectHandler(disconnectReason -> {
             connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.network.disconnect", bedrockServerSession.getAddress().getAddress(), disconnectReason));