Skip to content

Commit b0de353

Browse files
committed
Fixed potential issues when using ViaLoader serverside
1 parent 83462d8 commit b0de353

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ repositories {
6262
```
6363
Here is an example dependency configuration for all components:
6464
```groovy
65-
implementation "com.viaversion:viaversion:5.0.4"
65+
implementation "com.viaversion:viaversion:5.0.5"
6666
implementation "com.viaversion:viabackwards-common:5.0.4"
6767
implementation "com.viaversion:viarewind-common:4.0.3"
6868
implementation "net.raphimc:ViaLegacy:3.0.3"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repositories {
5050
}
5151

5252
dependencies {
53-
compileOnly "com.viaversion:viaversion-common:5.0.4"
53+
compileOnly "com.viaversion:viaversion-common:5.0.5"
5454
compileOnly "com.viaversion:viabackwards-common:5.0.4"
5555
compileOnly "com.viaversion:viarewind-common:4.0.3"
5656
compileOnly "net.raphimc:ViaLegacy:3.0.3"

src/main/java/net/raphimc/vialoader/netty/VLLegacyPipeline.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public VLLegacyPipeline(final UserConnection user) {
5151
this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user));
5252
}
5353

54-
@Deprecated
5554
public VLLegacyPipeline(final UserConnection user, final ProtocolVersion version) {
5655
this.user = user;
5756
this.version = version;
@@ -62,16 +61,18 @@ public void handlerAdded(ChannelHandlerContext ctx) {
6261
ctx.pipeline().addBefore(this.packetDecoderName(), VIA_DECODER_NAME, this.createViaDecoder());
6362
ctx.pipeline().addBefore(this.packetEncoderName(), VIA_ENCODER_NAME, this.createViaEncoder());
6463

65-
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
66-
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
67-
ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender());
68-
ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover());
69-
} else if (this.version.getName().startsWith("Bedrock")) {
70-
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
71-
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
72-
this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec());
73-
ctx.pipeline().remove(this.lengthPrependerName());
74-
ctx.pipeline().addBefore(VIA_DECODER_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
64+
if (this.user.isClientSide()) {
65+
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
66+
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
67+
ctx.pipeline().addBefore(this.lengthSplitterName(), VIALEGACY_PRE_NETTY_LENGTH_PREPENDER_NAME, this.createViaLegacyPreNettyLengthPrepender());
68+
ctx.pipeline().addBefore(this.lengthPrependerName(), VIALEGACY_PRE_NETTY_LENGTH_REMOVER_NAME, this.createViaLegacyPreNettyLengthRemover());
69+
} else if (this.version.getName().startsWith("Bedrock")) {
70+
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
71+
ctx.pipeline().addBefore(this.lengthSplitterName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
72+
this.replaceLengthSplitter(ctx, this.createViaBedrockBatchLengthCodec());
73+
ctx.pipeline().remove(this.lengthPrependerName());
74+
ctx.pipeline().addBefore(VIA_DECODER_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
75+
}
7576
}
7677
}
7778

src/main/java/net/raphimc/vialoader/netty/VLPipeline.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public VLPipeline(final UserConnection user) {
4949
this(user, Via.getManager().getProviders().get(VersionProvider.class).getServerProtocol(user));
5050
}
5151

52-
@Deprecated
5352
public VLPipeline(final UserConnection user, final ProtocolVersion version) {
5453
this.user = user;
5554
this.version = version;
@@ -59,14 +58,16 @@ public VLPipeline(final UserConnection user, final ProtocolVersion version) {
5958
public void handlerAdded(ChannelHandlerContext ctx) {
6059
ctx.pipeline().addBefore(this.packetCodecName(), VIA_CODEC_NAME, this.createViaCodec());
6160

62-
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
63-
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
64-
ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec());
65-
} else if (this.version.getName().startsWith("Bedrock")) {
66-
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
67-
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
68-
this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec());
69-
ctx.pipeline().addBefore(VIA_CODEC_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
61+
if (this.user.isClientSide()) {
62+
final ProtocolVersion r1_6_4 = ProtocolVersion.getProtocol(VersionType.RELEASE_INITIAL, 78);
63+
if (r1_6_4.isKnown() && this.version.olderThanOrEqualTo(r1_6_4)) {
64+
ctx.pipeline().addBefore(this.lengthCodecName(), VIALEGACY_PRE_NETTY_LENGTH_CODEC_NAME, this.createViaLegacyPreNettyLengthCodec());
65+
} else if (this.version.getName().startsWith("Bedrock")) {
66+
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_DISCONNECT_HANDLER_NAME, this.createViaBedrockDisconnectHandler());
67+
ctx.pipeline().addBefore(this.lengthCodecName(), VIABEDROCK_FRAME_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockFrameEncapsulationHandler());
68+
this.replaceLengthCodec(ctx, this.createViaBedrockBatchLengthCodec());
69+
ctx.pipeline().addBefore(VIA_CODEC_NAME, VIABEDROCK_PACKET_ENCAPSULATION_HANDLER_NAME, this.createViaBedrockPacketEncapsulationHandler());
70+
}
7071
}
7172
}
7273

0 commit comments

Comments
 (0)