Skip to content

allow custom Channel type to be wrapped in InjectionFactory#fromChannel #2756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow custom Channel type to be wrapped in InjectionFactory#fromChannel #2756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/comphenix/protocol/injector/netty/channel/InjectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,19 @@ public Injector fromChannel(Channel channel, ChannelListener listener, Temporary
Object netManager = this.findNetworkManager(channel);
Player temporaryPlayer = playerFactory.createTemporaryPlayer(this.server);

// Use the channel field from an already found network manager to prevent our channel injector given in
// this method from overwriting initialized custom channel implementation in some spigot forks
Channel wrappedChannel = FuzzyReflection.getFieldValue(netManager, Channel.class, true);
if (wrappedChannel == null) {
// Use the channel straight from ChannelHandlerContext as fallback if the field has null value
wrappedChannel = channel;
}

NettyChannelInjector injector = new NettyChannelInjector(
temporaryPlayer,
this.server,
netManager,
channel,
wrappedChannel,
listener,
this,
this.errorReporter);
Expand Down