13
0
geforkt von Mirrors/Velocity

Merge branch 'master' of https://github.com/creeper123123321/Velocity into creeper123123321-master

Dieser Commit ist enthalten in:
Andrew Steinborn 2019-03-24 13:57:26 -04:00
Commit b369256400
3 geänderte Dateien mit 5 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -137,6 +137,7 @@ public class LoginSessionHandler implements MinecraftSessionHandler {
smc.setSessionHandler(new BackendPlaySessionHandler(server, serverConn)); smc.setSessionHandler(new BackendPlaySessionHandler(server, serverConn));
serverConn.getPlayer().setConnectedServer(serverConn); serverConn.getPlayer().setConnectedServer(serverConn);
smc.getChannel().config().setAutoRead(true); smc.getChannel().config().setAutoRead(true);
smc.getChannel().read();
}, smc.eventLoop()); }, smc.eventLoop());
return true; return true;
} }

Datei anzeigen

@ -2,6 +2,7 @@ package com.velocitypowered.proxy.connection.backend;
import static com.velocitypowered.proxy.VelocityServer.GSON; import static com.velocitypowered.proxy.VelocityServer.GSON;
import static com.velocitypowered.proxy.connection.forge.legacy.LegacyForgeConstants.HANDSHAKE_HOSTNAME_TOKEN; import static com.velocitypowered.proxy.connection.forge.legacy.LegacyForgeConstants.HANDSHAKE_HOSTNAME_TOKEN;
import static com.velocitypowered.proxy.network.Connections.FLOW_HANDLER;
import static com.velocitypowered.proxy.network.Connections.FRAME_DECODER; import static com.velocitypowered.proxy.network.Connections.FRAME_DECODER;
import static com.velocitypowered.proxy.network.Connections.FRAME_ENCODER; import static com.velocitypowered.proxy.network.Connections.FRAME_ENCODER;
import static com.velocitypowered.proxy.network.Connections.HANDLER; import static com.velocitypowered.proxy.network.Connections.HANDLER;
@ -34,6 +35,7 @@ import com.velocitypowered.proxy.server.VelocityRegisteredServer;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
import io.netty.handler.flow.FlowControlHandler;
import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.handler.timeout.ReadTimeoutHandler;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -83,6 +85,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
TimeUnit.MILLISECONDS)) TimeUnit.MILLISECONDS))
.addLast(FRAME_DECODER, new MinecraftVarintFrameDecoder()) .addLast(FRAME_DECODER, new MinecraftVarintFrameDecoder())
.addLast(FRAME_ENCODER, MinecraftVarintLengthEncoder.INSTANCE) .addLast(FRAME_ENCODER, MinecraftVarintLengthEncoder.INSTANCE)
.addLast(FLOW_HANDLER, new FlowControlHandler())
.addLast(MINECRAFT_DECODER, .addLast(MINECRAFT_DECODER,
new MinecraftDecoder(ProtocolUtils.Direction.CLIENTBOUND)) new MinecraftDecoder(ProtocolUtils.Direction.CLIENTBOUND))
.addLast(MINECRAFT_ENCODER, .addLast(MINECRAFT_ENCODER,

Datei anzeigen

@ -6,6 +6,7 @@ public class Connections {
public static final String CIPHER_ENCODER = "cipher-encoder"; public static final String CIPHER_ENCODER = "cipher-encoder";
public static final String COMPRESSION_DECODER = "compression-decoder"; public static final String COMPRESSION_DECODER = "compression-decoder";
public static final String COMPRESSION_ENCODER = "compression-encoder"; public static final String COMPRESSION_ENCODER = "compression-encoder";
public static final String FLOW_HANDLER = "flow-handler";
public static final String FRAME_DECODER = "frame-decoder"; public static final String FRAME_DECODER = "frame-decoder";
public static final String FRAME_ENCODER = "frame-encoder"; public static final String FRAME_ENCODER = "frame-encoder";
public static final String HANDLER = "handler"; public static final String HANDLER = "handler";