Skip to content

Feature: server transfer feature flag #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onebeastchris merged 1 commit into from
May 18, 2024
Merged

Feature: server transfer feature flag #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ClientListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,12 @@ public void packetReceived(Session session, Packet packet) {
} else if (packet instanceof ClientboundStartConfigurationPacket) {
session.send(new ServerboundConfigurationAcknowledgedPacket());
} else if (packet instanceof ClientboundTransferPacket transferPacket) {
TcpClientSession newSession = new TcpClientSession(transferPacket.getHost(), transferPacket.getPort(), session.getPacketProtocol());
newSession.setFlags(session.getFlags());
session.disconnect("Transferring");
newSession.connect(true, true);
if (session.getFlag(MinecraftConstants.FOLLOW_TRANFERS, true)) {
TcpClientSession newSession = new TcpClientSession(transferPacket.getHost(), transferPacket.getPort(), session.getPacketProtocol());
newSession.setFlags(session.getFlags());
session.disconnect("Transferring");
newSession.connect(true, true);
}
}
} else if (protocol.getState() == ProtocolState.CONFIGURATION) {
if (packet instanceof ClientboundFinishConfigurationPacket) {
Expand All @@ -140,10 +142,12 @@ public void packetReceived(Session session, Packet packet) {
session.send(new ServerboundSelectKnownPacks(Collections.emptyList()));
}
} else if (packet instanceof ClientboundTransferPacket transferPacket) {
TcpClientSession newSession = new TcpClientSession(transferPacket.getHost(), transferPacket.getPort(), session.getPacketProtocol());
newSession.setFlags(session.getFlags());
session.disconnect("Transferring");
newSession.connect(true, true);
if (session.getFlag(MinecraftConstants.FOLLOW_TRANFERS, true)) {
TcpClientSession newSession = new TcpClientSession(transferPacket.getHost(), transferPacket.getPort(), session.getPacketProtocol());
newSession.setFlags(session.getFlags());
session.disconnect("Transferring");
newSession.connect(true, true);
}
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public final class MinecraftConstants {
*/
public static final Flag<Boolean> SEND_BLANK_KNOWN_PACKS_RESPONSE = new Flag<>("send-blank-known-packs-response", Boolean.class);

/**
* Session flag for determining whether to create a new TcpClientSession when the Java server sends a ClientboundTransferPacket.
*/
public static final Flag<Boolean> FOLLOW_TRANFERS = new Flag<>("follow-transfers", Boolean.class);

// Server Key Constants

/**
Expand Down