Fixing PacketPlayInHandskaingSetProtocol wrapper for 1.17

funkemunky · Dec 2, 2021 · e7bc843 · e7bc843
1 parent f66b9a0
commit e7bc843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.../main/java/cc/funkemunky/api/tinyprotocol/api/packets/channelhandler/TinyProtocol1_8.java b/.../main/java/cc/funkemunky/api/tinyprotocol/api/packets/channelhandler/TinyProtocol1_8.java
@@ -451,6 +451,7 @@ public int getProtocolVersion(Player player) {
 
 		Integer protocol = protocolLookup.get(channel);
 		if (protocol != null) {
+			System.out.println(player.getName() + ": " + protocol);
 			return protocol;
 		} else return -1;
 	}
@@ -540,6 +541,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 				channelLookup.put(profile.getName(), channel);
 			} else if (PACKET_SET_PROTOCOL.getParent().isInstance(msg)) {
 				int protocol = ((Enum)protocolType.get(msg)).ordinal();
+				System.out.println("PacketPlayInSetProtocol: " + protocol);
 				if (protocol == 3) {
 					int id = protocolId.get(msg);
 					protocolLookup.put(channel, id);

diff --git a/...ain/java/cc/funkemunky/api/tinyprotocol/packet/login/WrappedHandshakingInSetProtocol.java b/...ain/java/cc/funkemunky/api/tinyprotocol/packet/login/WrappedHandshakingInSetProtocol.java
@@ -18,9 +18,9 @@ public WrappedHandshakingInSetProtocol(Object object) {
     public String hostname;
     public WrappedEnumProtocol enumProtocol;
 
-    private static WrappedField aField = packet.getFieldByType(int.class, 0),
+    private static WrappedField aField = packet.getFieldByType(int.class, ProtocolVersion.getGameVersion().isOrAbove(ProtocolVersion.v1_17) ? 1 :0),
             hostField = packet.getFieldByType(String.class, 0),
-            portField = packet.getFieldByType(int.class, 1),
+            portField = packet.getFieldByType(int.class, ProtocolVersion.getGameVersion().isOrAbove(ProtocolVersion.v1_17) ? 2 : 1),
             protocolField = packet.getFieldByType(WrappedEnumProtocol.enumProtocol.getParent(), 0);
 
     @Override