Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-27 13:15:52 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Listening to Handshake Packets & ServerPingRecord (#2933)

Browse Source 
Fixed Listening to Handshake Packets

Fixes #2647
This commit is contained in:
LOOHP 2024-06-03 04:31:07 +01:00 committed by GitHub
parent 1325ec6a98
commit 720bb83234
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/comphenix/protocol/injector/netty/channel/ChannelProtocolUtil.java
View File

@ -12,7 +12,6 @@ import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.FieldAccessor; import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.accessors.MethodAccessor; import com.comphenix.protocol.reflect.accessors.MethodAccessor;
import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract; import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftReflection;
import io.netty.channel.Channel; import io.netty.channel.Channel;
@ -31,7 +30,7 @@ final class ChannelProtocolUtil {
.declaringClassExactType(networkManagerClass) .declaringClassExactType(networkManagerClass)
.build()); .build());
BiFunction<Channel, PacketType.Sender, Object> baseResolver = null; BiFunction<Channel, PacketType.Sender, PacketType.Protocol> baseResolver = null;
if (attributeKeys.isEmpty()) { if (attributeKeys.isEmpty()) {
// since 1.20.5 the protocol is stored as final field in de-/encoder // since 1.20.5 the protocol is stored as final field in de-/encoder
baseResolver = new Post1_20_5WrappedResolver(); baseResolver = new Post1_20_5WrappedResolver();
@ -75,10 +74,10 @@ final class ChannelProtocolUtil {
} }
// decorate the base resolver by wrapping its return value into our packet type value // decorate the base resolver by wrapping its return value into our packet type value
PROTOCOL_RESOLVER = baseResolver.andThen(nmsProtocol -> PacketType.Protocol.fromVanilla((Enum<?>) nmsProtocol)); PROTOCOL_RESOLVER = baseResolver;
} }
private static final class Pre1_20_2DirectResolver implements BiFunction<Channel, PacketType.Sender, Object> { private static final class Pre1_20_2DirectResolver implements BiFunction<Channel, PacketType.Sender, PacketType.Protocol> {
private final AttributeKey<Object> attributeKey; private final AttributeKey<Object> attributeKey;
@ -87,12 +86,12 @@ final class ChannelProtocolUtil {
} }
@Override @Override
public Object apply(Channel channel, PacketType.Sender sender) { public PacketType.Protocol apply(Channel channel, PacketType.Sender sender) {
return channel.attr(this.attributeKey).get(); return PacketType.Protocol.fromVanilla((Enum<?>) channel.attr(this.attributeKey).get());
} }
} }
private static final class Post1_20_2WrappedResolver implements BiFunction<Channel, PacketType.Sender, Object> { private static final class Post1_20_2WrappedResolver implements BiFunction<Channel, PacketType.Sender, PacketType.Protocol> {
private final AttributeKey<Object> serverBoundKey; private final AttributeKey<Object> serverBoundKey;
private final AttributeKey<Object> clientBoundKey; private final AttributeKey<Object> clientBoundKey;
@ -106,7 +105,7 @@ final class ChannelProtocolUtil {
} }
@Override @Override
public Object apply(Channel channel, PacketType.Sender sender) { public PacketType.Protocol apply(Channel channel, PacketType.Sender sender) {
AttributeKey<Object> key = this.getKeyForSender(sender); AttributeKey<Object> key = this.getKeyForSender(sender);
Object codecData = channel.attr(key).get(); Object codecData = channel.attr(key).get();
if (codecData == null) { if (codecData == null) {
@ -114,7 +113,7 @@ final class ChannelProtocolUtil {
} }
FieldAccessor protocolAccessor = this.getProtocolAccessor(codecData.getClass()); FieldAccessor protocolAccessor = this.getProtocolAccessor(codecData.getClass());
return protocolAccessor.get(codecData); return PacketType.Protocol.fromVanilla((Enum<?>) protocolAccessor.get(codecData));
} }
private AttributeKey<Object> getKeyForSender(PacketType.Sender sender) { private AttributeKey<Object> getKeyForSender(PacketType.Sender sender) {
@ -141,22 +140,26 @@ final class ChannelProtocolUtil {
/** /**
* Since 1.20.5 the protocol is stored as final field in de-/encoder * Since 1.20.5 the protocol is stored as final field in de-/encoder
*/ */
private static final class Post1_20_5WrappedResolver implements BiFunction<Channel, PacketType.Sender, Object> { private static final class Post1_20_5WrappedResolver implements BiFunction<Channel, PacketType.Sender, PacketType.Protocol> {
// lazy initialized when needed // lazy initialized when needed
private Function<Object, Object> serverProtocolAccessor; private Function<Object, Object> serverProtocolAccessor;
private Function<Object, Object> clientProtocolAccessor; private Function<Object, Object> clientProtocolAccessor;
@Override @Override
public Object apply(Channel channel, PacketType.Sender sender) { public PacketType.Protocol apply(Channel channel, PacketType.Sender sender) {
String key = this.getKeyForSender(sender); String key = this.getKeyForSender(sender);
Object codecHandler = channel.pipeline().get(key); Object codecHandler = channel.pipeline().get(key);
if (codecHandler == null) { if (codecHandler == null) {
String unconfiguratedKey = this.getUnconfiguratedKeyForSender(sender);
if (channel.pipeline().get(unconfiguratedKey) != null) {
return PacketType.Protocol.HANDSHAKING;
}
return null; return null;
} }
Function<Object, Object> protocolAccessor = this.getProtocolAccessor(codecHandler.getClass(), sender); Function<Object, Object> protocolAccessor = this.getProtocolAccessor(codecHandler.getClass(), sender);
return protocolAccessor.apply(codecHandler); return PacketType.Protocol.fromVanilla((Enum<?>) protocolAccessor.apply(codecHandler));
} }
private Function<Object, Object> getProtocolAccessor(Class<?> codecHandler, PacketType.Sender sender) { private Function<Object, Object> getProtocolAccessor(Class<?> codecHandler, PacketType.Sender sender) {
@ -187,6 +190,17 @@ final class ChannelProtocolUtil {
} }
} }
private String getUnconfiguratedKeyForSender(PacketType.Sender sender) {
switch (sender) {
case SERVER:
return "outbound_config";
case CLIENT:
return "inbound_config";
default:
throw new IllegalArgumentException("Illegal packet sender " + sender.name());
}
}
private Function<Object, Object> getProtocolAccessor(Class<?> codecHandler) { private Function<Object, Object> getProtocolAccessor(Class<?> codecHandler) {
Class<?> protocolInfoClass = MinecraftReflection.getProtocolInfoClass(); Class<?> protocolInfoClass = MinecraftReflection.getProtocolInfoClass();

2
src/main/java/com/comphenix/protocol/wrappers/ping/ServerPingRecord.java
View File

@ -60,7 +60,7 @@ public final class ServerPingRecord implements ServerPingImpl {
DATA_WRAPPER = AutoWrapper.wrap(ServerData.class, SERVER_DATA_CLASS); DATA_WRAPPER = AutoWrapper.wrap(ServerData.class, SERVER_DATA_CLASS);
SAMPLE_WRAPPER = AutoWrapper.wrap(PlayerSample.class, PLAYER_SAMPLE_CLASS); SAMPLE_WRAPPER = AutoWrapper.wrap(PlayerSample.class, PLAYER_SAMPLE_CLASS);
FAVICON_WRAPPER = AutoWrapper.wrap(Favicon.class, MinecraftReflection.getMinecraftClass("network.protocol.status.ServerPing$a")); FAVICON_WRAPPER = AutoWrapper.wrap(Favicon.class, MinecraftReflection.getMinecraftClass("network.protocol.status.ServerPing$a", "network.protocol.status.ServerStatus$Favicon"));
PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter()); PROFILE_LIST_CONVERTER = BukkitConverters.getListConverter(BukkitConverters.getWrappedGameProfileConverter());