From 44250cbb995b74db2e41a1a05e64bfc6a1bddbd6 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 20 Jul 2022 18:36:28 +0200 Subject: [PATCH] 1.19.1-pre6 --- .../viaversion/api/protocol/version/ProtocolVersion.java | 2 +- .../java/com/viaversion/viaversion/ViaManagerImpl.java | 3 --- .../viaversion/protocol/ProtocolPathEntryImpl.java | 8 ++++++++ .../protocol1_19to1_18_2/packets/EntityPackets.java | 2 +- gradle.properties | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index 23e2b9ec6..a768c6d59 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -81,7 +81,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1)); public static final ProtocolVersion v1_18_2 = register(758, "1.18.2"); public static final ProtocolVersion v1_19 = register(759, "1.19"); - public static final ProtocolVersion v1_19_1 = register(760, 98, "1.19.1"); + public static final ProtocolVersion v1_19_1 = register(760, 99, "1.19.1"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java index 521a3bb2b..6a84b1af0 100644 --- a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java @@ -142,10 +142,7 @@ public class ViaManagerImpl implements ViaManager { platform.getLogger().warning("This version of Minecraft is extremely outdated and support for it has reached its end of life. " + "You will still be able to run Via on this Minecraft version, but we are unlikely to provide any further fixes or help with problems specific to legacy Minecraft versions. " + "Please consider updating to give your players a better experience and to avoid issues that have long been fixed."); - } else if (protocolVersion.highestSupportedVersion() == ProtocolVersion.v1_19.getVersion()) { - platform.getLogger().warning("Due to technical limitations, ViaVersion does not support 1.19.1+ clients on 1.19.0 servers. Please update your server to a newer version."); } - } checkJavaVersion(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java index 1911cf461..b3f349317 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java @@ -54,4 +54,12 @@ public class ProtocolPathEntryImpl implements ProtocolPathEntry { result = 31 * result + protocol.hashCode(); return result; } + + @Override + public String toString() { + return "ProtocolPathEntryImpl{" + + "outputProtocolVersion=" + outputProtocolVersion + + ", protocol=" + protocol + + '}'; + } } \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java index b63261b30..b40650dc9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java @@ -293,7 +293,7 @@ public final class EntityPackets extends EntityRewriter { } // No public profile signature - wrapper.write(Type.BOOLEAN, false); + wrapper.write(Type.OPTIONAL_PROFILE_KEY, null); } else if (action == 1 || action == 2) { // Update gamemode/update latency wrapper.passthrough(Type.VAR_INT); } else if (action == 3) { // Update display name diff --git a/gradle.properties b/gradle.properties index d31ddf90c..9c93cc4fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.4.0-1.19.1-pre5-SNAPSHOT +projectVersion=4.4.0-1.19.1-pre6-SNAPSHOT # Gradle properties org.gradle.daemon=true