Uploaded image for project: 'Minecraft: Java Edition'
  1. Minecraft: Java Edition
  2. MC-252082

Loading server resource packs reloads twice when one is already loaded

    XMLWordPrintable

Details

    • Bug
    • Status: Resolved
    • Resolution: Fixed
    • 1.18.2, 1.19 Pre-release 1, 1.19 Pre-release 2, 1.19 Pre-release 4
    • 22w24a
    • None
    • Plausible
    • Resource Packs
    • Important

    Description

      When receiving a resource pack from the server via the resource pack packet the client downloads (or reapplies if it exists) the resource pack provided by the ClientboundResourcePackPacket.

      During this process, the client clears the current server resource pack (the issue) and then deletes old server resource pack files which may not be used anymore.

      However, clearing the server resource pack is an un-necessary step as it causes the client to reload all resources to set the server resource pack to nothing and reload it a second time if the pack successfully downloads to apply the new server resource pack. When the pack is successfully downloaded (or found), the client sets the server pack which does the aforementioned step above of setting the server resource pack and reloading resources.

      In this situation, the client only needs to clear the server pack when the new resource pack fails to download, which is how it currently functions but without un-necessarily reloading when the pack succeeds in downloading.

      Below is a patch of a code change I made to fix this issue using official mappings.
       

      diff --git a/src/main/java/net/minecraft/client/resources/ClientPackSource.java b/src/main/java/net/minecraft/client/resources/ClientPackSource.java
      --- a/src/main/java/net/minecraft/client/resources/ClientPackSource.java
      +++ b/src/main/java/net/minecraft/client/resources/ClientPackSource.java
      @@ -112,8 +112,6 @@
       
               CompletableFuture var14;
               try {
      -            this.clearServerPack();
      -            this.clearOldDownloads();
                   File file = new File(this.serverPackDir, string3);
                   CompletableFuture<?> completableFuture;
                   if (file.exists()) {
      @@ -144,6 +142,7 @@
                                   (void_, throwable) -> {
                                       if (throwable != null) {
                                           LOGGER.warn("Pack application failed: {}, deleting file {}", throwable.getMessage(), file);
      +                                    this.clearServerPack();
                                           deleteQuietly(file);
                                           Minecraft minecraftx = Minecraft.getInstance();
                                           minecraftx.execute(
      @@ -172,6 +171,7 @@
                                   }
                           );
                   var14 = this.currentDownload;
      +            this.clearOldDownloads();
               } finally {
                   this.downloadLock.unlock();
               } 

      This moves the clearOldDownloads call to after everything is finished to cover the edge case of an old resource pack still being in use, therefore being unable to be deleted and causing the method to fail. The main change here is moving the clearServerPack call to only when the pack fails to apply.

      The result of this fix is the client only reloading once when receiving a server resource pack while one is already loaded. (for example, the server sends another resource pack packet after the initial one is sent)

       

      Attachments

        Activity

          People

            gegy1000 [Mojang] Gegy
            Jacksoncreeper Jackson
            Votes:
            14 Vote for this issue
            Watchers:
            7 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:
              CHK: