Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rebased on master

This commit is contained in:
creeper123123321 2020-06-30 16:06:05 -03:00 committed by Five (Xer)
parent 4813cc3077
commit 6c3479e739
No known key found for this signature in database
GPG Key ID: A3F306B10E6330E7
4 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java
View File

@ -26,11 +26,7 @@ import us.myles.ViaVersion.util.GsonUtil;
import us.myles.ViaVersion.velocity.VersionInfo;
import us.myles.ViaVersion.velocity.command.VelocityCommandHandler;
import us.myles.ViaVersion.velocity.command.VelocityCommandSender;
import us.myles.ViaVersion.velocity.platform.VelocityTaskId;
import us.myles.ViaVersion.velocity.platform.VelocityViaAPI;
import us.myles.ViaVersion.velocity.platform.VelocityViaConfig;
import us.myles.ViaVersion.velocity.platform.VelocityViaInjector;
import us.myles.ViaVersion.velocity.platform.VelocityViaLoader;
import us.myles.ViaVersion.velocity.platform.*;
import us.myles.ViaVersion.velocity.service.ProtocolDetectorService;
import us.myles.ViaVersion.velocity.util.LoggerWrapper;

8
velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityDecodeHandler.java
View File

@ -34,14 +34,14 @@ public class VelocityDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(bytebuf);
try {
boolean needsCompress = handleCompressionOrder(ctx, draft);
boolean needsCompress = handleCompressionOrder(ctx, bytebuf);
info.transformIncoming(draft, CancelDecoderException::generate);
info.transformIncoming(bytebuf, CancelDecoderException::generate);
if (needsCompress) {
recompress(ctx, draft);
recompress(ctx, bytebuf);
}
out.add(draft.retain());
out.add(bytebuf.retain());
} finally {
transformedBuf.release();
}

2
velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityEncodeHandler.java
View File

@ -46,7 +46,7 @@ public class VelocityEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
}
}
private boolean handleCompressionOrder(ChannelHandlerContext ctx, ByteBuf draft) throws InvocationTargetException {
private boolean handleCompressionOrder(ChannelHandlerContext ctx, ByteBuf buf) throws InvocationTargetException {
//if (handledCompression) return false;
int encoderIndex = ctx.pipeline().names().indexOf("compression-encoder");

26
velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityConnectionManager.java
View File

@ -1,33 +1,11 @@
package us.myles.ViaVersion.velocity.platform;
import io.netty.channel.ServerChannel;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.platform.ViaConnectionManager;
import java.util.Objects;
public class VelocityConnectionManager extends ViaConnectionManager {
@Override
public void onLoginSuccess(UserConnection connection) {
if (connection.isClientSide()) {
System.out.println("backend connect!");
Objects.requireNonNull(connection, "connection is null!");
connections.add(connection);
} else {
System.out.println("frontend connect!");
super.onLoginSuccess(connection);
}
}
@Override
public void onDisconnect(UserConnection connection) {
if (connection.isClientSide()) {
System.out.println("backend disconnect!");
Objects.requireNonNull(connection, "connection is null!");
connections.remove(connection);
} else {
System.out.println("frontend disconnect!");
super.onDisconnect(connection);
}
public boolean isFrontEnd(UserConnection conn) {
return !conn.isClientSide();
}
}