Skip to content

Commit

Permalink
Fix modern IP forwarding
Browse files Browse the repository at this point in the history
  • Loading branch information
aromaa committed Jan 4, 2024
1 parent d469dbd commit 80faee9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.spongepowered.common.accessor.network.ConnectionAccessor;
import org.spongepowered.common.accessor.server.network.ServerLoginPacketListenerImplAccessor;
import org.spongepowered.common.applaunch.config.core.SpongeConfigs;
import org.spongepowered.common.bridge.server.network.ServerLoginPacketListenerImplBridge;

import java.net.InetAddress;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -95,6 +96,12 @@ public static void sendQuery(final ServerLoginPacketListenerImpl mcConn) {
((InetSocketAddress) connection.getRemoteAddress()).getPort()));

((ServerLoginPacketListenerImplAccessor) mcConn).accessor$gameProfile(VelocityForwardingInfo.createProfile(response));

if (((ServerLoginPacketListenerImplBridge) mcConn).bridge$fireAuthEvent()) {
return;
}

((ServerLoginPacketListenerImplAccessor) mcConn).accessor$state(ServerLoginPacketListenerImpl.State.NEGOTIATING);
}).exceptionally(err -> {
if (!(err instanceof NoResponseException)) { // Handled above
VelocityForwardingInfo.LOGGER.error("Failed to process velocity forwarding info", err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public abstract class ServerLoginPacketListenerImplMixin_IpForward {
this.ipForward$sentVelocityForwardingRequest = true;

VelocityForwardingInfo.sendQuery((ServerLoginPacketListenerImpl) (Object) this);

info.cancel();
}
}

Expand Down

0 comments on commit 80faee9

Please sign in to comment.