From f0e02aad32fde5b5a2226ee233f227681557dbe5 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Tue, 10 Dec 2019 19:06:18 -0600 Subject: [PATCH] Initial 1.14 Bedrock support --- .../src/main/java/org/geysermc/connector/GeyserConnector.java | 1 + .../geysermc/connector/entity/living/horse/HorseEntity.java | 2 +- .../org/geysermc/connector/network/UpstreamPacketHandler.java | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java index 4abe763ff..46443ffa0 100644 --- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java +++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java @@ -68,6 +68,7 @@ import java.util.concurrent.TimeUnit; public class GeyserConnector implements Connector { public static final BedrockPacketCodec BEDROCK_PACKET_CODEC = Bedrock_v388.V388_CODEC; + public static final int BEDROCK_1_14_PROTOCOL_VERSION = 389; public static final String NAME = "Geyser"; public static final String VERSION = "1.0-SNAPSHOT"; diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/horse/HorseEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/horse/HorseEntity.java index 3ad0b1145..ab7ac3f6b 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/living/horse/HorseEntity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/living/horse/HorseEntity.java @@ -40,7 +40,7 @@ public class HorseEntity extends AbstractHorseEntity { @Override public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { - if (entityMetadata.getId() == 17) { + if (entityMetadata.getId() == 18) { metadata.put(EntityData.VARIANT, (int) entityMetadata.getValue()); } diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java index 4990280b9..555e54e65 100644 --- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java @@ -45,8 +45,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { @Override public boolean handle(LoginPacket loginPacket) { - if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) { - connector.getLogger().debug("unsupported"); + if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_1_14_PROTOCOL_VERSION) { session.getUpstream().disconnect("Unsupported Bedrock version. Are you running an outdated version?"); return true; }