funkemunky/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2026-05-31 05:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minecraft 26.2-pre-2 support

Browse Source
This commit is contained in:
md_5
2026-05-29 19:20:13 +10:00
parent c21769b06c
commit 0cf68b5d63
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_21_9 = 773;
public static final int MINECRAFT_1_21_11 = 774;
public static final int MINECRAFT_26_1 = 775;
public static final int MINECRAFT_26_2 = 1073742137;
public static final int MINECRAFT_26_2 = 1073742140;
public static final List<String> SUPPORTED_VERSIONS;
public static final List<Integer> SUPPORTED_VERSION_IDS;
protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
+9
View File
@@ -21,6 +21,7 @@ public class LoginSuccess extends DefinedPacket
private UUID uuid;
private String username;
private Property[] properties;
private UUID sessionId;
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@@ -42,6 +43,10 @@ public class LoginSuccess extends DefinedPacket
// Whether the client should disconnect on its own if it receives invalid data from the server
buf.readBoolean();
}
if ( protocolVersion >= ProtocolConstants.MINECRAFT_26_2 )
{
sessionId = readUUID( buf );
}
}
@Override
@@ -65,6 +70,10 @@ public class LoginSuccess extends DefinedPacket
// Vanilla sends true so we also send true
buf.writeBoolean( true );
}
if ( protocolVersion >= ProtocolConstants.MINECRAFT_26_2 )
{
writeUUID( sessionId, buf );
}
}
@Override
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+1 -1
View File
@@ -386,7 +386,7 @@ public class ServerConnector extends PacketHandler
} else
{
LoginResult loginProfile = user.getPendingConnection().getLoginProfile();
user.unsafe().sendPacket( new LoginSuccess( user.getRewriteId(), user.getName(), ( loginProfile == null ) ? null : loginProfile.getProperties() ) );
user.unsafe().sendPacket( new LoginSuccess( user.getRewriteId(), user.getName(), ( loginProfile == null ) ? null : loginProfile.getProperties(), user.getSessionId() ) );
user.getCh().setEncodeProtocol( Protocol.CONFIGURATION );
}
}
proxy/src/main/java/net/md_5/bungee/UserConnection.java
+2
View File
@@ -131,6 +131,8 @@ public final class UserConnection implements ProxiedPlayer
private final Collection<String> permissions = new CaseInsensitiveSet();
/*========================================================================*/
@Getter
private final UUID sessionId = UUID.randomUUID();
@Getter
@Setter
private int clientEntityId;
@Getter
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+1 -1
View File
@@ -621,7 +621,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( getVersion() < ProtocolConstants.MINECRAFT_1_20_2 )
{
unsafe.sendPacket( new LoginSuccess( getRewriteId(), getName(), ( loginProfile == null ) ? null : loginProfile.getProperties() ) );
unsafe.sendPacket( new LoginSuccess( getRewriteId(), getName(), ( loginProfile == null ) ? null : loginProfile.getProperties(), null ) );
ch.setProtocol( Protocol.GAME );
}
finish2();