GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Move version check to GameProtocol

Browse source
This commit is contained in:
onebeastchris 2024-08-12 23:23:29 +02:00
parent 7675d91124
commit edd4896f96
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
View file

@ -97,6 +97,10 @@ public final class GameProtocol {
return session.getUpstream().getProtocolVersion() < Bedrock_v685.CODEC.getProtocolVersion(); return session.getUpstream().getProtocolVersion() < Bedrock_v685.CODEC.getProtocolVersion();
} }
public static boolean isPre1_21_2(GeyserSession session) {
return session.getUpstream().getProtocolVersion() < Bedrock_v686.CODEC.getProtocolVersion();
}
/** /**
* Gets the {@link PacketCodec} for Minecraft: Java Edition. * Gets the {@link PacketCodec} for Minecraft: Java Edition.
* *

4
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -141,6 +141,7 @@ import org.geysermc.geyser.item.type.BlockItem;
import org.geysermc.geyser.level.BedrockDimension; import org.geysermc.geyser.level.BedrockDimension;
import org.geysermc.geyser.level.JavaDimension; import org.geysermc.geyser.level.JavaDimension;
import org.geysermc.geyser.level.physics.CollisionManager; import org.geysermc.geyser.level.physics.CollisionManager;
import org.geysermc.geyser.network.GameProtocol;
import org.geysermc.geyser.network.netty.LocalSession; import org.geysermc.geyser.network.netty.LocalSession;
import org.geysermc.geyser.registry.Registries; import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.registry.type.BlockMappings; import org.geysermc.geyser.registry.type.BlockMappings;
@ -2117,8 +2118,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
@Override @Override
public void closeForm() { public void closeForm() {
// TODO remove once 1.21.2 is lowest supported version if (!GameProtocol.isPre1_21_2(this)) {
if (upstream.getProtocolVersion() >= 686) {
sendUpstreamPacket(new ClientboundCloseFormPacket()); sendUpstreamPacket(new ClientboundCloseFormPacket());
} }
} }