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 5d09c6ed8..e764992da 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 @@ -80,7 +80,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_17_1 = register(756, "1.17.1"); 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, 85, "1.19"); + public static final ProtocolVersion v1_19 = register(759, 86, "1.19"); 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/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java index cc7c69829..8f31c6734 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java @@ -173,7 +173,7 @@ public final class Protocol1_19To1_18_2 extends AbstractProtocol { // We can't send chat messages before the chat type registry has been sent in the join packet final QueuedMessagesStorage messagesStorage = wrapper.user().get(QueuedMessagesStorage.class); - if (messagesStorage != null) { + if (!messagesStorage.hasSent()) { final QueuedMessagesStorage.Message message = new QueuedMessagesStorage.Message(wrapper.get(Type.COMPONENT, 0), wrapper.get(Type.VAR_INT, 0)); messagesStorage.messages().add(message); wrapper.cancel(); 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 28af70c09..5af0b71b2 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 @@ -268,6 +268,10 @@ public final class EntityPackets extends EntityRewriter { map(Type.VAR_INT); // Max players map(Type.VAR_INT); // Chunk radius map(Type.VAR_INT); // Simulation distance + map(Type.BOOLEAN); // Reduced debug info + map(Type.BOOLEAN); // Show death screen + map(Type.BOOLEAN); // Flat + create(Type.OPTIONAL_GLOBAL_POSITION, null); // Last death location handler(playerTrackerHandler()); handler(worldDataTrackerHandlerByKey()); handler(biomeSizeTracker()); @@ -307,6 +311,13 @@ public final class EntityPackets extends EntityRewriter { public void registerMap() { handler(wrapper -> writeDimensionKey(wrapper, wrapper.user().get(DimensionRegistryStorage.class))); map(Type.STRING); // World + map(Type.LONG); // Seed + map(Type.UNSIGNED_BYTE); // Gamemode + map(Type.BYTE); // Previous gamemode + map(Type.BOOLEAN); // Debug + map(Type.BOOLEAN); // Flat + map(Type.BOOLEAN); // Keep player data + create(Type.OPTIONAL_GLOBAL_POSITION, null); // Last death location handler(worldDataTrackerHandlerByKey()); } }); @@ -399,7 +410,6 @@ public final class EntityPackets extends EntityRewriter { meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); }); - filter().type(Entity1_19Types.PLAYER).addIndex(19); // Last death location filter().type(Entity1_19Types.CAT).index(19).handler((event, meta) -> meta.setMetaType(Types1_19.META_TYPES.catVariantType)); } diff --git a/gradle.properties b/gradle.properties index f0b045600..ccd0270e0 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.3.0-1.19-pre1-SNAPSHOT +projectVersion=4.3.0-1.19-pre2-SNAPSHOT # Gradle properties org.gradle.daemon=true