R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Works with newer Velocity versions

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-10-27 23:00:04 +02:00
parent 4dfa9d02bd
commit b723d0ae6d
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java
View File

@ -7,7 +7,6 @@ import com.velocitypowered.proxy.VelocityServer;
import com.velocitypowered.proxy.connection.MinecraftConnection;
import com.velocitypowered.proxy.connection.backend.VelocityServerConnection;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.connection.client.LoginSessionHandler;
import com.velocitypowered.proxy.protocol.ProtocolUtils;
import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage;
import io.netty.buffer.ByteBuf;
@ -36,8 +35,18 @@ public class FML2ClientConnectionPhase extends VelocityForgeClientConnectionPhas
private static final Method CONNECT_TO_INITIAL_SERVER;
static {
Class clazz;
try {
CONNECT_TO_INITIAL_SERVER = LoginSessionHandler.class.getDeclaredMethod("connectToInitialServer", ConnectedPlayer.class);
clazz = Class.forName("com.velocitypowered.proxy.connection.client.LoginSessionHandler");
} catch (ClassNotFoundException ignored){
try {
clazz = Class.forName("com.velocitypowered.proxy.connection.client.AuthSessionHandler");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
try {
CONNECT_TO_INITIAL_SERVER = clazz.getDeclaredMethod("connectToInitialServer", ConnectedPlayer.class);
CONNECT_TO_INITIAL_SERVER.setAccessible(true);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);