MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

We don't need the hash to go along with the resource pack response

Browse Source
This commit is contained in:
Andrew Steinborn
2021-06-08 15:41:54 -04:00
parent 4619053962
commit 8892e2a5c6
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -285,8 +285,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
@Override @Override
public boolean handle(ResourcePackResponse packet) { public boolean handle(ResourcePackResponse packet) {
return player.onResourcePackResponse(packet.getStatus(), return player.onResourcePackResponse(packet.getStatus(), packet.getHash());
ByteBufUtil.decodeHexDump(packet.getHash()));
} }
@Override @Override

11
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@@ -924,7 +924,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
.compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) { .compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) {
break; break;
} }
onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED, new byte[0]); onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED);
queued = null; queued = null;
} }
if (queued == null) { if (queued == null) {
@@ -960,9 +960,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
/** /**
* Processes a client response to a sent resource-pack. * Processes a client response to a sent resource-pack.
*/ */
public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status, public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status) {
@Nullable byte[] hash) {
final boolean peek = status == PlayerResourcePackStatusEvent.Status.ACCEPTED; final boolean peek = status == PlayerResourcePackStatusEvent.Status.ACCEPTED;
final ResourcePackInfo queued = peek final ResourcePackInfo queued = peek
? outstandingResourcePacks.peek() : outstandingResourcePacks.poll(); ? outstandingResourcePacks.peek() : outstandingResourcePacks.poll();
@@ -979,7 +977,6 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
} }
}); });
switch (status) { switch (status) {
case ACCEPTED: case ACCEPTED:
previousResourceResponse = true; previousResourceResponse = true;
@@ -1000,9 +997,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
} }
if (!peek) { if (!peek) {
connection.eventLoop().execute(() -> { connection.eventLoop().execute(this::tickResourcePackQueue);
tickResourcePackQueue();
});
} }
return queued != null && queued.getOrigin() == ResourcePackInfo.Origin.DOWNSTREAM_SERVER; return queued != null && queued.getOrigin() == ResourcePackInfo.Origin.DOWNSTREAM_SERVER;