diff --git a/triton-velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java b/triton-velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java index 00686f5c..ed5ca570 100644 --- a/triton-velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java +++ b/triton-velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java @@ -140,6 +140,12 @@ public void refreshAll() { } public void injectNettyPipeline() { + if (Triton.get().getConfig().isUsePacketEvents()) { + // PacketEvents handler covers all packets translated by Velocity, + // so no need to inject ourselves into netty anymore. + Triton.get().getLogger().logDebug("Skipped injecting into netty pipeline for player %1 because PacketEvents is in use", getUUID()); + return; + } ConnectedPlayer connectedPlayer = (ConnectedPlayer) this.parent; connectedPlayer.getConnection().getChannel().pipeline() .addAfter(Connections.MINECRAFT_ENCODER, "triton-custom-encoder", new VelocityNettyEncoder(this));