Reapply resource pack after config state

Paul19988 · Oct 7, 2023 · fadf839 · fadf839
1 parent c076f04
commit fadf839
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ConfigSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ConfigSessionHandler.java
@@ -59,6 +59,8 @@ public class ConfigSessionHandler implements MinecraftSessionHandler {
   private final VelocityServerConnection serverConn;
   private final CompletableFuture<Impl> resultFuture;
 
+  private ResourcePackInfo resourcePackToApply;
+
   private State state;
 
   /**
@@ -77,7 +79,9 @@ public class ConfigSessionHandler implements MinecraftSessionHandler {
   }
 
   @Override
-  public void deactivated() {
+  public void activated() {
+    resourcePackToApply = serverConn.getPlayer().getAppliedResourcePack();
+    serverConn.getPlayer().clearAppliedResourcePack();
   }
 
   @Override
@@ -126,6 +130,7 @@ public boolean handle(ResourcePackRequest packet) {
               ResourcePackInfo.Origin.DOWNSTREAM_SERVER);
         }
 
+        resourcePackToApply = null;
         serverConn.getPlayer().queueResourcePack(toSend);
       } else if (serverConn.getConnection() != null) {
         serverConn.getConnection().write(new ResourcePackResponse(packet.getHash(),
@@ -158,6 +163,9 @@ public boolean handle(FinishedUpdate packet) {
         smc.setActiveSessionHandler(StateRegistry.PLAY,
             new TransitionSessionHandler(server, serverConn, resultFuture));
       }
+      if (serverConn.getPlayer().getAppliedResourcePack() == null && resourcePackToApply != null) {
+        serverConn.getPlayer().queueResourcePack(resourcePackToApply);
+      }
       smc.setAutoReading(true);
     }, smc.eventLoop());
     return true;

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -1027,6 +1027,13 @@ && getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) {
     return pendingResourcePack;
   }
 
+  /**
+   * Clears the applied resource pack field.
+   */
+  public void clearAppliedResourcePack() {
+    appliedResourcePack = null;
+  }
+
   /**
    * Processes a client response to a sent resource-pack.
    */