Skip to content

Commit 80faee9

Browse files
committed
Fix modern IP forwarding
1 parent d469dbd commit 80faee9

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/main/java/org/spongepowered/common/ipforward/velocity/VelocityForwardingInfo.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.spongepowered.common.accessor.network.ConnectionAccessor;
4646
import org.spongepowered.common.accessor.server.network.ServerLoginPacketListenerImplAccessor;
4747
import org.spongepowered.common.applaunch.config.core.SpongeConfigs;
48+
import org.spongepowered.common.bridge.server.network.ServerLoginPacketListenerImplBridge;
4849

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

9798
((ServerLoginPacketListenerImplAccessor) mcConn).accessor$gameProfile(VelocityForwardingInfo.createProfile(response));
99+
100+
if (((ServerLoginPacketListenerImplBridge) mcConn).bridge$fireAuthEvent()) {
101+
return;
102+
}
103+
104+
((ServerLoginPacketListenerImplAccessor) mcConn).accessor$state(ServerLoginPacketListenerImpl.State.NEGOTIATING);
98105
}).exceptionally(err -> {
99106
if (!(err instanceof NoResponseException)) { // Handled above
100107
VelocityForwardingInfo.LOGGER.error("Failed to process velocity forwarding info", err);

src/mixins/java/org/spongepowered/common/mixin/ipforward/server/network/ServerLoginPacketListenerImplMixin_IpForward.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public abstract class ServerLoginPacketListenerImplMixin_IpForward {
6565
this.ipForward$sentVelocityForwardingRequest = true;
6666

6767
VelocityForwardingInfo.sendQuery((ServerLoginPacketListenerImpl) (Object) this);
68+
69+
info.cancel();
6870
}
6971
}
7072

0 commit comments

Comments
 (0)