SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

fix legacy console disconnect messages (#1197)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Aaron 2024-01-18 11:10:30 +01:00 committet von GitHub
Ursprung c7c65e3339
Commit eabff2020f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
2 geänderte Dateien mit 7 neuen und 11 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
Datei anzeigen

@ -103,13 +103,12 @@ import net.kyori.adventure.platform.facet.FacetPointers.Type;
import net.kyori.adventure.pointer.Pointers; import net.kyori.adventure.pointer.Pointers;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import net.kyori.adventure.title.Title.Times; import net.kyori.adventure.title.Title.Times;
import net.kyori.adventure.title.TitlePart; import net.kyori.adventure.title.TitlePart;
import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.GlobalTranslator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@ -126,7 +125,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
PlainTextComponentSerializer.builder().flattener(TranslatableMapper.FLATTENER).build(); PlainTextComponentSerializer.builder().flattener(TranslatableMapper.FLATTENER).build();
static final PermissionProvider DEFAULT_PERMISSIONS = s -> PermissionFunction.ALWAYS_UNDEFINED; static final PermissionProvider DEFAULT_PERMISSIONS = s -> PermissionFunction.ALWAYS_UNDEFINED;
private static final Logger logger = LogManager.getLogger(ConnectedPlayer.class); private static final ComponentLogger logger = ComponentLogger.logger(ConnectedPlayer.class);
private final Identity identity = new IdentityImpl(); private final Identity identity = new IdentityImpl();
/** /**
@ -577,8 +576,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
Component translated = this.translateMessage(reason); Component translated = this.translateMessage(reason);
if (server.getConfiguration().isLogPlayerConnections()) { if (server.getConfiguration().isLogPlayerConnections()) {
logger.info("{} has disconnected: {}", this, logger.info(Component.text(this + " has disconnected: ").append(translated));
LegacyComponentSerializer.legacySection().serialize(translated));
} }
connection.closeWith(Disconnect.create(translated, this.getProtocolVersion(), duringLogin)); connection.closeWith(Disconnect.create(translated, this.getProtocolVersion(), duringLogin));
} }

10
proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialInboundConnection.java
Datei anzeigen

@ -29,10 +29,8 @@ import java.net.InetSocketAddress;
import java.util.Locale; import java.util.Locale;
import java.util.Optional; import java.util.Optional;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.GlobalTranslator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/** /**
* Implements {@link InboundConnection} for a newly-established connection. * Implements {@link InboundConnection} for a newly-established connection.
@ -40,7 +38,8 @@ import org.apache.logging.log4j.Logger;
public final class InitialInboundConnection implements VelocityInboundConnection, public final class InitialInboundConnection implements VelocityInboundConnection,
MinecraftConnectionAssociation { MinecraftConnectionAssociation {
private static final Logger logger = LogManager.getLogger(InitialInboundConnection.class); private static final ComponentLogger logger = ComponentLogger
.logger(InitialInboundConnection.class);
private final MinecraftConnection connection; private final MinecraftConnection connection;
private final String cleanedAddress; private final String cleanedAddress;
@ -97,8 +96,7 @@ public final class InitialInboundConnection implements VelocityInboundConnection
Component translated = GlobalTranslator.render(reason, ClosestLocaleMatcher.INSTANCE Component translated = GlobalTranslator.render(reason, ClosestLocaleMatcher.INSTANCE
.lookupClosest(Locale.getDefault())); .lookupClosest(Locale.getDefault()));
if (connection.server.getConfiguration().isLogPlayerConnections()) { if (connection.server.getConfiguration().isLogPlayerConnections()) {
logger.info("{} has disconnected: {}", this, logger.info(Component.text(this + " has disconnected: ").append(translated));
LegacyComponentSerializer.legacySection().serialize(translated));
} }
connection.closeWith(Disconnect.create(translated, getProtocolVersion(), true)); connection.closeWith(Disconnect.create(translated, getProtocolVersion(), true));
} }