mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-21 03:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0

Browse Source
This commit is contained in:
Andrew Steinborn 2023-01-21 18:22:04 -05:00
commit f744b37ad5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLogin.java
View File

@ -143,7 +143,7 @@ public class ServerLogin implements MinecraftPacket {
public int expectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
// Accommodate the rare (but likely malicious) use of UTF-8 usernames, since it is technically
// legal on the protocol level.
int base = 1 + (16 * 4);
int base = 1 + (16 * 3);
// Adjustments for Key-authentication
if (version.compareTo(ProtocolVersion.MINECRAFT_1_19) >= 0) {
if (version.compareTo(ProtocolVersion.MINECRAFT_1_19_3) < 0) {

7
proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java
View File

@ -155,9 +155,10 @@ public class VelocityRegisteredServer implements RegisteredServer, ForwardingAud
*/
public boolean sendPluginMessage(ChannelIdentifier identifier, ByteBuf data) {
for (ConnectedPlayer player : players.values()) {
VelocityServerConnection connection = player.getConnectedServer();
if (connection != null && connection.getServer() == this) {
return connection.sendPluginMessage(identifier, data);
VelocityServerConnection serverConnection = player.getConnectedServer();
if (serverConnection != null && serverConnection.getConnection() != null
&& serverConnection.getServer() == this) {
return serverConnection.sendPluginMessage(identifier, data);
}
}