Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-12-25 07:40:08 +01:00
Code Issues Releases Aktivität

22w43a

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2022-10-26 18:28:53 +02:00
Ursprung 808b1fd2f0
Commit 9a9c6c4644
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
4 geänderte Dateien mit 6 neuen und 13 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
build.gradle.kts
Datei anzeigen

@ -5,7 +5,7 @@ plugins {
allprojects { allprojects {
group = "com.viaversion" group = "com.viaversion"
version = "4.5.0-22w42a-SNAPSHOT" version = "4.5.0-22w43a-SNAPSHOT"
description = "Allow older clients to join newer server versions." description = "Allow older clients to join newer server versions."
} }

11
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
Datei anzeigen

@ -154,10 +154,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
public void registerMap() { public void registerMap() {
map(Type.STRING); // Name map(Type.STRING); // Name
handler(wrapper -> { handler(wrapper -> {
wrapper.write(Type.UUID, wrapper.user().get(ChatSessionStorage.class).uuid()); // Session UUID
final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY); final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY);
wrapper.write(Type.OPTIONAL_PROFILE_KEY, null);
if (profileKey == null) { if (profileKey == null) {
wrapper.user().put(new NonceStorage(null)); wrapper.user().put(new NonceStorage(null));
} }
@ -184,15 +181,11 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
map(Type.BYTE_ARRAY_PRIMITIVE); // Keys map(Type.BYTE_ARRAY_PRIMITIVE); // Keys
handler(wrapper -> { handler(wrapper -> {
final NonceStorage nonceStorage = wrapper.user().remove(NonceStorage.class); final NonceStorage nonceStorage = wrapper.user().remove(NonceStorage.class);
if (nonceStorage.nonce() == null) {
return;
}
final boolean isNonce = wrapper.read(Type.BOOLEAN); final boolean isNonce = wrapper.read(Type.BOOLEAN);
wrapper.write(Type.BOOLEAN, true); if (!isNonce) {
if (!isNonce) { // Should never be true at this point, but /shrug otherwise
wrapper.read(Type.LONG); // Salt wrapper.read(Type.LONG); // Salt
wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, nonceStorage.nonce()); wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, nonceStorage.nonce() != null ? nonceStorage.nonce() : new byte[0]);
} }
}); });
} }

4
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/EntityPackets1_19_3.java
Datei anzeigen

@ -126,9 +126,9 @@ public final class EntityPackets1_19_3 extends EntityRewriter<Protocol1_19_1To1_
// Now check for the other parts individually and add dummy values if not present // Now check for the other parts individually and add dummy values if not present
final ProfileKey profileKey; final ProfileKey profileKey;
if (actions.get(INITIALIZE_CHAT)) { if (actions.get(INITIALIZE_CHAT) && wrapper.read(Type.BOOLEAN)) {
wrapper.read(Type.UUID); // Session UUID wrapper.read(Type.UUID); // Session UUID
profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY); profileKey = wrapper.read(Type.PROFILE_KEY);
} else { } else {
profileKey = null; profileKey = null;
} }

2
gradle/libs.versions.toml
Datei anzeigen

@ -3,7 +3,7 @@ metadata.format.version = "1.1"
[versions] [versions]
# ViaVersion # ViaVersion
viaver = "4.5.0-22w42a-SNAPSHOT" viaver = "4.5.0-22w43a-SNAPSHOT"
# Common provided # Common provided
netty = "4.0.20.Final" netty = "4.0.20.Final"