Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-25 19:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Properly throw the client information packet into the queue instead

Browse Source
This commit is contained in:
Nassim Jahnke 2023-10-03 20:54:51 +10:00
parent cabb95a3a4
commit fdb7f47749
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
View File

@ -101,7 +101,10 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
final ConfigurationState configurationBridge = wrapper.user().get(ConfigurationState.class); final ConfigurationState configurationBridge = wrapper.user().get(ConfigurationState.class);
if (!configurationBridge.setLastDimensionRegistry(dimensionRegistry)) { if (!configurationBridge.setLastDimensionRegistry(dimensionRegistry)) {
// No change, so no need to re-enter the configuration state - just let this one through // No change, so no need to re-enter the configuration state - just let this one through
configurationBridge.sendClientInformation(wrapper.user()); final PacketWrapper clientInformationPacket = configurationBridge.clientInformationPacket(wrapper.user());
if (clientInformationPacket != null) {
clientInformationPacket.sendToServer(Protocol1_20_2To1_20.class);
}
return; return;
} }

14
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
View File

@ -106,12 +106,16 @@ public class ConfigurationState implements StorableObject {
} }
public void sendQueuedPackets(final UserConnection connection) throws Exception { public void sendQueuedPackets(final UserConnection connection) throws Exception {
if (joinGamePacket != null) { final boolean hasJoinGamePacket = joinGamePacket != null;
if (hasJoinGamePacket) {
packetQueue.add(0, joinGamePacket); packetQueue.add(0, joinGamePacket);
joinGamePacket = null; joinGamePacket = null;
} }
sendClientInformation(connection); final PacketWrapper clientInformationPacket = clientInformationPacket(connection);
if (clientInformationPacket != null) {
packetQueue.add(hasJoinGamePacket ? 1 : 0, toQueuedPacket(clientInformationPacket, false, true));
}
final ConfigurationState.QueuedPacket[] queuedPackets = packetQueue.toArray(new ConfigurationState.QueuedPacket[0]); final ConfigurationState.QueuedPacket[] queuedPackets = packetQueue.toArray(new ConfigurationState.QueuedPacket[0]);
packetQueue.clear(); packetQueue.clear();
@ -151,10 +155,10 @@ public class ConfigurationState implements StorableObject {
NONE, PROFILE_SENT, CONFIGURATION, REENTERING_CONFIGURATION NONE, PROFILE_SENT, CONFIGURATION, REENTERING_CONFIGURATION
} }
public void sendClientInformation(final UserConnection connection) throws Exception { public @Nullable PacketWrapper clientInformationPacket(final UserConnection connection) {
if (clientInformation == null) { if (clientInformation == null) {
// Should never be null, but we also shouldn't error // Should never be null, but we also shouldn't error
return; return null;
} }
final PacketWrapper settingsPacket = PacketWrapper.create(ServerboundPackets1_19_4.CLIENT_SETTINGS, connection); final PacketWrapper settingsPacket = PacketWrapper.create(ServerboundPackets1_19_4.CLIENT_SETTINGS, connection);
@ -166,7 +170,7 @@ public class ConfigurationState implements StorableObject {
settingsPacket.write(Type.VAR_INT, clientInformation.mainHand); settingsPacket.write(Type.VAR_INT, clientInformation.mainHand);
settingsPacket.write(Type.BOOLEAN, clientInformation.textFiltering); settingsPacket.write(Type.BOOLEAN, clientInformation.textFiltering);
settingsPacket.write(Type.BOOLEAN, clientInformation.allowListing); settingsPacket.write(Type.BOOLEAN, clientInformation.allowListing);
settingsPacket.scheduleSendToServer(Protocol1_20_2To1_20.class); return settingsPacket;
} }
public static final class QueuedPacket { public static final class QueuedPacket {