From 3f0e366bacad887bf971f8c77ee7d5867b5ba4c3 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Sun, 8 Oct 2023 18:04:22 +0200
Subject: [PATCH] Fix: Don't rename extensions while the extension directory is
 being walked (#4197)

---
 .../extension/GeyserExtensionLoader.java      | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java b/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java
index dac5ee802..da0fbffda 100644
--- a/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java
@@ -43,9 +43,9 @@ import java.io.Reader;
 import java.nio.file.*;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 @RequiredArgsConstructor
 public class GeyserExtensionLoader extends ExtensionLoader {
@@ -148,47 +148,46 @@ public class GeyserExtensionLoader extends ExtensionLoader {
             Map<String, GeyserExtensionContainer> loadedExtensions = new LinkedHashMap<>();
 
             Pattern[] extensionFilters = this.extensionFilters();
-            try (Stream<Path> entries = Files.walk(extensionsDirectory)) {
-                entries.forEach(path -> {
-                    if (Files.isDirectory(path)) {
+            List<Path> extensionPaths = Files.walk(extensionsDirectory).toList();
+            extensionPaths.forEach(path -> {
+                if (Files.isDirectory(path)) {
+                    return;
+                }
+
+                for (Pattern filter : extensionFilters) {
+                    if (!filter.matcher(path.getFileName().toString()).matches()) {
+                        return;
+                    }
+                }
+
+                try {
+                    GeyserExtensionDescription description = this.extensionDescription(path);
+
+                    String name = description.name();
+                    String id = description.id();
+                    if (extensions.containsKey(id) || extensionManager.extension(id) != null) {
+                        GeyserImpl.getInstance().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.extensions.load.duplicate", name, path.toString()));
                         return;
                     }
 
-                    for (Pattern filter : extensionFilters) {
-                        if (!filter.matcher(path.getFileName().toString()).matches()) {
-                            return;
-                        }
+                    // Completely different API version
+                    if (description.majorApiVersion() != Geyser.api().majorApiVersion()) {
+                        GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
+                        return;
                     }
 
-                    try {
-                        GeyserExtensionDescription description = this.extensionDescription(path);
-
-                        String name = description.name();
-                        String id = description.id();
-                        if (extensions.containsKey(id) || extensionManager.extension(id) != null) {
-                            GeyserImpl.getInstance().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.extensions.load.duplicate", name, path.toString()));
-                            return;
-                        }
-
-                        // Completely different API version
-                        if (description.majorApiVersion() != Geyser.api().majorApiVersion()) {
-                            GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
-                            return;
-                        }
-
-                        // If the extension requires new API features, being backwards compatible
-                        if (description.minorApiVersion() > Geyser.api().minorApiVersion()) {
-                            GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
-                            return;
-                        }
-
-                        extensions.put(id, path);
-                        loadedExtensions.put(id, this.loadExtension(path, description));
-                    } catch (Exception e) {
-                        GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_with_name", path.getFileName(), path.toAbsolutePath()), e);
+                    // If the extension requires new API features, being backwards compatible
+                    if (description.minorApiVersion() > Geyser.api().minorApiVersion()) {
+                        GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
+                        return;
                     }
-                });
-            }
+
+                    extensions.put(id, path);
+                    loadedExtensions.put(id, this.loadExtension(path, description));
+                } catch (Exception e) {
+                    GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_with_name", path.getFileName(), path.toAbsolutePath()), e);
+                }
+            });
 
             for (GeyserExtensionContainer container : loadedExtensions.values()) {
                 this.extensionContainers.put(container.extension(), container);