From 1c36b66dcbf2f1a42c60eea0c5d9aee8fc506020 Mon Sep 17 00:00:00 2001 From: R00tB33rMan <36140389+R00tB33rMan@users.noreply.github.com> Date: Tue, 28 May 2024 09:53:20 -0400 Subject: [PATCH] Fix `null` or empty has handling in `LegacyResourcepackHandler` (#1331) --- .../player/resourcepack/LegacyResourcePackHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java index b2b803991..b1b325484 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/player/resourcepack/LegacyResourcePackHandler.java @@ -109,7 +109,7 @@ public sealed class LegacyResourcePackHandler extends ResourcePackHandler 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 sealed class LegacyResourcePackHandler extends ResourcePackHandler @Override public boolean hasPackAppliedByHash(final byte[] hash) { + if (hash == null) { + return false; + } + return this.appliedResourcePack != null && Arrays.equals(this.appliedResourcePack.getHash(), hash); }