13
0
geforkt von Mirrors/Velocity

Properly pass connection exceptions to the logger

Dieser Commit ist enthalten in:
Shane Freeder 2024-05-01 17:22:18 +01:00
Ursprung 399bc2325f
Commit 5cdcf86cf9
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C

Datei anzeigen

@ -195,8 +195,9 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
boolean isQuietDecoderException = cause instanceof QuietDecoderException; boolean isQuietDecoderException = cause instanceof QuietDecoderException;
boolean willLog = !isQuietDecoderException && !frontlineHandler; boolean willLog = !isQuietDecoderException && !frontlineHandler;
if (willLog) { if (willLog) {
logger.error("{}: exception encountered in {}", association, activeSessionHandler, logger.atError().withThrowable(cause)
cause); .log("{}: exception encountered in {}", association,
activeSessionHandler);
} else { } else {
knownDisconnect = true; knownDisconnect = true;
} }
@ -226,7 +227,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
* Writes and immediately flushes a message to the connection. * Writes and immediately flushes a message to the connection.
* *
* @param msg the message to write * @param msg the message to write
*
* @return A {@link ChannelFuture} that will complete when packet is successfully sent * @return A {@link ChannelFuture} that will complete when packet is successfully sent
*/ */
@Nullable @Nullable
@ -370,12 +370,12 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
this.state = state; this.state = state;
// If the connection is LEGACY (<1.6), the decoder and encoder are not set. // If the connection is LEGACY (<1.6), the decoder and encoder are not set.
final MinecraftEncoder minecraftEncoder = this.channel.pipeline() final MinecraftEncoder minecraftEncoder = this.channel.pipeline()
.get(MinecraftEncoder.class); .get(MinecraftEncoder.class);
if (minecraftEncoder != null) { if (minecraftEncoder != null) {
minecraftEncoder.setState(state); minecraftEncoder.setState(state);
} }
final MinecraftDecoder minecraftDecoder = this.channel.pipeline() final MinecraftDecoder minecraftDecoder = this.channel.pipeline()
.get(MinecraftDecoder.class); .get(MinecraftDecoder.class);
if (minecraftDecoder != null) { if (minecraftDecoder != null) {
minecraftDecoder.setState(state); minecraftDecoder.setState(state);
} }
@ -395,8 +395,8 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
public void addPlayPacketQueueHandler() { public void addPlayPacketQueueHandler() {
if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE) == null) { if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE) == null) {
this.channel.pipeline().addAfter(Connections.MINECRAFT_ENCODER, Connections.PLAY_PACKET_QUEUE, this.channel.pipeline().addAfter(Connections.MINECRAFT_ENCODER, Connections.PLAY_PACKET_QUEUE,
new PlayPacketQueueHandler(this.protocolVersion, new PlayPacketQueueHandler(this.protocolVersion,
channel.pipeline().get(MinecraftEncoder.class).getDirection())); channel.pipeline().get(MinecraftEncoder.class).getDirection()));
} }
} }