From 9c44aff8c36d2d39b858e5d9834b46e1f91893da Mon Sep 17 00:00:00 2001 From: Corey Shupe Date: Thu, 3 Mar 2022 01:52:21 -0500 Subject: [PATCH] Flip output for queued resource pack status passthrough conditional (#659) * Flip output for queued resource pack status passthrough conditional * Hotfix to queue the intended resource pack info. --- .../proxy/connection/backend/BackendPlaySessionHandler.java | 2 +- .../proxy/connection/client/ConnectedPlayer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java index d83e6f0c6..c485be158 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java @@ -165,7 +165,7 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler { .setOriginalOrigin(ResourcePackInfo.Origin.DOWNSTREAM_SERVER); } - serverConn.getPlayer().queueResourcePack(builder.build()); + serverConn.getPlayer().queueResourcePack(toSend); } else if (serverConn.getConnection() != null) { serverConn.getConnection().write(new ResourcePackResponse( packet.getHash(), 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 f3f7f13a0..7a9146787 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 @@ -986,7 +986,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { } return queued != null - && queued.getOriginalOrigin() == ResourcePackInfo.Origin.DOWNSTREAM_SERVER; + && queued.getOriginalOrigin() != ResourcePackInfo.Origin.DOWNSTREAM_SERVER; } /**