13
0
geforkt von Mirrors/Velocity

Fix several problems and clean up the BungeeCord plugin messaging support.

Fixes #402
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-12-26 20:52:12 -05:00
Ursprung b1f7980c5d
Commit f6078e9b74
2 geänderte Dateien mit 26 neuen und 46 gelöschten Zeilen

Datei anzeigen

@ -236,45 +236,34 @@ public class BungeeCordMessageResponder {
});
}
private ByteBuf prepareForwardMessage(ByteBufDataInput in) {
String channel = in.readUTF();
short messageLength = in.readShort();
ByteBuf buf = Unpooled.buffer();
ByteBufDataOutput forwarded = new ByteBufDataOutput(buf);
forwarded.writeUTF(channel);
forwarded.writeShort(messageLength);
buf.writeBytes(in.unwrap().readSlice(messageLength));
return buf;
}
private void processForwardToPlayer(ByteBufDataInput in) {
proxy.getPlayer(in.readUTF())
.ifPresent(foundPlayer -> sendServerResponse((ConnectedPlayer) foundPlayer,
prepareForwardMessage(in)));
Optional<Player> player = proxy.getPlayer(in.readUTF());
if (player.isPresent()) {
ByteBuf toForward = in.unwrap().copy();
sendServerResponse((ConnectedPlayer) player.get(), toForward);
}
}
private void processForwardToServer(ByteBufDataInput in) {
String target = in.readUTF();
ByteBuf toForward = prepareForwardMessage(in);
ByteBuf toForward = in.unwrap().copy();
if (target.equals("ALL")) {
ByteBuf unreleasableForward = Unpooled.unreleasableBuffer(toForward);
try {
for (RegisteredServer rs : proxy.getAllServers()) {
((VelocityRegisteredServer) rs).sendPluginMessage(LEGACY_CHANNEL, unreleasableForward);
((VelocityRegisteredServer) rs).sendPluginMessage(LEGACY_CHANNEL,
toForward.retainedSlice());
}
} finally {
toForward.release();
}
} else {
proxy.getServer(target).ifPresent(rs -> ((VelocityRegisteredServer) rs)
.sendPluginMessage(LEGACY_CHANNEL, toForward));
Optional<RegisteredServer> server = proxy.getServer(target);
if (server.isPresent()) {
((VelocityRegisteredServer) server.get()).sendPluginMessage(LEGACY_CHANNEL, toForward);
} else {
toForward.release();
}
}
// Note: this method will always release the buffer!
private void sendResponseOnConnection(ByteBuf buf) {
sendServerResponse(this.player, buf);
}
static String getBungeeCordChannel(ProtocolVersion version) {
@ -282,29 +271,17 @@ public class BungeeCordMessageResponder {
: LEGACY_CHANNEL.getId();
}
// Note: this method will always release the buffer!
private void sendResponseOnConnection(ByteBuf buf) {
sendServerResponse(this.player, buf);
}
// Note: this method will always release the buffer!
private static void sendServerResponse(ConnectedPlayer player, ByteBuf buf) {
MinecraftConnection serverConnection = player.ensureAndGetCurrentServer().ensureConnected();
String chan = getBungeeCordChannel(serverConnection.getProtocolVersion());
PluginMessage msg = null;
boolean released = false;
try {
VelocityServerConnection vsc = player.getConnectedServer();
if (vsc == null) {
return;
}
MinecraftConnection serverConn = vsc.ensureConnected();
msg = new PluginMessage(chan, buf);
serverConn.write(msg);
released = true;
} finally {
if (!released && msg != null) {
msg.release();
}
}
PluginMessage msg = new PluginMessage(chan, buf);
serverConnection.write(msg);
}
boolean process(PluginMessage message) {

Datei anzeigen

@ -125,7 +125,9 @@ public class VelocityRegisteredServer implements RegisteredServer, ForwardingAud
}
/**
* Sends a plugin message to the server through this connection.
* Sends a plugin message to the server through this connection. The message will be released
* afterwards.
*
* @param identifier the channel ID to use
* @param data the data
* @return whether or not the message was sent
@ -133,11 +135,12 @@ 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.getServerInfo().equals(serverInfo)) {
if (connection != null && connection.getServer() == this) {
return connection.sendPluginMessage(identifier, data);
}
}
data.release();
return false;
}