Fix null or empty has handling in LegacyResourcepackHandler

PaperMC · May 26, 2024 · 4a56689 · 4a56689
1 parent 42d4288
commit 4a56689
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...a/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java b/...a/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java
@@ -109,7 +109,7 @@ private void tickResourcePackQueue() {
             break;
           }
           onResourcePackResponse(new ResourcePackResponseBundle(queued.getId(),
-                  new String(queued.getHash()),
+                  queued.getHash() == null ? "" : new String(queued.getHash()),
                   PlayerResourcePackStatusEvent.Status.DECLINED));
           queued = null;
         }
@@ -172,6 +172,10 @@ public boolean onResourcePackResponse(
 
   @Override
   public boolean hasPackAppliedByHash(final byte[] hash) {
+    if (hash == null) {
+      return false;
+    }
+
     return this.appliedResourcePack != null
             && Arrays.equals(this.appliedResourcePack.getHash(), hash);
   }