diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java index 7c872961..6fb7633b 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java @@ -285,8 +285,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler { @Override public boolean handle(ResourcePackResponse packet) { - return player.onResourcePackResponse(packet.getStatus(), - ByteBufUtil.decodeHexDump(packet.getHash())); + return player.onResourcePackResponse(packet.getStatus(), packet.getHash()); } @Override 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 index 26ba80c2..64bb1512 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java @@ -924,7 +924,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { .compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) { break; } - onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED, new byte[0]); + onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED); queued = null; } if (queued == null) { @@ -960,9 +960,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { /** * Processes a client response to a sent resource-pack. */ - public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status, - @Nullable byte[] hash) { - + public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status) { final boolean peek = status == PlayerResourcePackStatusEvent.Status.ACCEPTED; final ResourcePackInfo queued = peek ? outstandingResourcePacks.peek() : outstandingResourcePacks.poll(); @@ -979,7 +977,6 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { } }); - switch (status) { case ACCEPTED: previousResourceResponse = true; @@ -1000,9 +997,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { } if (!peek) { - connection.eventLoop().execute(() -> { - tickResourcePackQueue(); - }); + connection.eventLoop().execute(this::tickResourcePackQueue); } return queued != null && queued.getOrigin() == ResourcePackInfo.Origin.DOWNSTREAM_SERVER;