Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-02-17 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up after the merge.

Browse Source
This commit is contained in:
Andrew Steinborn
2023-10-27 16:51:53 -04:00
parent a037ab4956
commit 0c7b8081d5
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,9 +107,9 @@ public class VelocityRegisteredServer implements RegisteredServer, ForwardingAud
throw new IllegalStateException("No Velocity proxy instance available");
}
CompletableFuture<ServerPing> pingFuture = new CompletableFuture<>();
server.createBootstrap(loop, serverInfo.getAddress()).handler(new ChannelInitializer<Channel>() {
server.createBootstrap(loop, serverInfo.getAddress()).handler(new ChannelInitializer<>() {
@Override
protected void initChannel(Channel ch) throws Exception {
protected void initChannel(Channel ch) {
ch.pipeline().addLast(FRAME_DECODER, new MinecraftVarintFrameDecoder())
.addLast(READ_TIMEOUT, new ReadTimeoutHandler(
pingOptions.getTimeout() == 0

3
proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java
View File

@@ -24,7 +24,6 @@ import com.velocitypowered.api.proxy.player.TabListEntry;
import com.velocitypowered.api.util.GameProfile;
import com.velocitypowered.proxy.connection.MinecraftConnection;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.console.VelocityConsole;
import com.velocitypowered.proxy.protocol.packet.RemovePlayerInfo;
import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfo;
import com.velocitypowered.proxy.protocol.packet.chat.RemoteChatSession;
@@ -48,7 +47,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*/
public class VelocityTabList implements InternalTabList {
private static final Logger logger = LogManager.getLogger(VelocityConsole.class);
private static final Logger logger = LogManager.getLogger(VelocityTabList.class);
private final ConnectedPlayer player;
private final MinecraftConnection connection;
private final Map<UUID, VelocityTabListEntry> entries;