3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-16 21:10:30 +01:00

Fix null or empty has handling in LegacyResourcepackHandler (#1331)

Dieser Commit ist enthalten in:
R00tB33rMan 2024-05-28 09:53:20 -04:00 committet von GitHub
Ursprung 42d4288334
Commit 1c36b66dcb
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194

Datei anzeigen

@ -109,7 +109,7 @@ public sealed class LegacyResourcePackHandler extends ResourcePackHandler
break; break;
} }
onResourcePackResponse(new ResourcePackResponseBundle(queued.getId(), onResourcePackResponse(new ResourcePackResponseBundle(queued.getId(),
new String(queued.getHash()), queued.getHash() == null ? "" : new String(queued.getHash()),
PlayerResourcePackStatusEvent.Status.DECLINED)); PlayerResourcePackStatusEvent.Status.DECLINED));
queued = null; queued = null;
} }
@ -172,6 +172,10 @@ public sealed class LegacyResourcePackHandler extends ResourcePackHandler
@Override @Override
public boolean hasPackAppliedByHash(final byte[] hash) { public boolean hasPackAppliedByHash(final byte[] hash) {
if (hash == null) {
return false;
}
return this.appliedResourcePack != null return this.appliedResourcePack != null
&& Arrays.equals(this.appliedResourcePack.getHash(), hash); && Arrays.equals(this.appliedResourcePack.getHash(), hash);
} }