From f1163828f814ee4c55df988d657d62285924f1fe Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Thu, 4 Jul 2024 00:42:11 +0200
Subject: [PATCH] Proper warning about version/uuid changes

---
 .../geyser/registry/loader/ResourcePackLoader.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
index 641d39ff5..9662f6f0b 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java
@@ -285,8 +285,12 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<String, Reso
                 ResourcePack newPack = ResourcePackLoader.readPack(pathPackCodec.path());
                 UUID newUUID = newPack.manifest().header().uuid();
                 if (newUUID.toString().equals(packId)) {
-                    GeyserImpl.getInstance().getLogger().info("Detected a new resource pack version (%s, old version %s) for pack at %s!"
+                    if (packVersion.equals(newPack.manifest().header().version().toString())) {
+                        GeyserImpl.getInstance().getLogger().info("No version or pack change detected: Was the resource pack server down?");
+                    } else {
+                        GeyserImpl.getInstance().getLogger().info("Detected a new resource pack version (%s, old version %s) for pack at %s!"
                             .formatted(packVersion, newPack.manifest().header().version().toString(), url));
+                    }
                 } else {
                     GeyserImpl.getInstance().getLogger().info("Detected a new resource pack at the url %s!".formatted(url));
                 }
@@ -301,8 +305,8 @@ public class ResourcePackLoader implements RegistryLoader<Path, Map<String, Reso
                     Path path = geyserUrlPackCodec.getFallback().path();
                     try {
                         GeyserImpl.getInstance().getScheduledThread().schedule(() -> {
-                            deleteFile(path);
                             CACHED_FAILED_PACKS.invalidate(packId);
+                            deleteFile(path);
                         }, 5, TimeUnit.MINUTES);
                     } catch (RejectedExecutionException exception) {
                         // No scheduling here, probably because we're shutting down?