Jona123/NPCLib
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small patch for TinyProtocol issues.

Browse Source
This commit is contained in:
Jitse Boonstra
2020-03-08 21:13:29 +01:00
parent 1a1f3618d5
commit 9bf3095a56
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
+7 -2
View File
@@ -40,7 +40,9 @@ public abstract class TinyProtocol {
private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection"); private static final Class<Object> serverConnectionClass = Reflection.getUntypedClass("{nms}.ServerConnection");
private static final Reflection.FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0); private static final Reflection.FieldAccessor<Object> getMinecraftServer = Reflection.getField("{obc}.CraftServer", minecraftServerClass, 0);
private static final Reflection.FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0); private static final Reflection.FieldAccessor<Object> getServerConnection = Reflection.getField(minecraftServerClass, serverConnectionClass, 0);
private static final Reflection.MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass); // This depends on the arrangement of fields in the ServerConnection class, check in every new version for updates!
private static final Reflection.FieldAccessor<List> networkMarkers = Reflection.getField(serverConnectionClass, List.class, 1);
// private static final Reflection.MethodInvoker getNetworkMarkers = Reflection.getTypedMethod(serverConnectionClass, null, List.class, serverConnectionClass);
// Packets we have to intercept // Packets we have to intercept
private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart"); private static final Class<?> PACKET_LOGIN_IN_START = Reflection.getMinecraftClass("PacketLoginInStart");
@@ -180,7 +182,10 @@ public abstract class TinyProtocol {
boolean looking = true; boolean looking = true;
// We need to synchronize against this list // We need to synchronize against this list
networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection); // Update 8/3/20 JMB: Fetch from field, the method doesn't exist...
// The field getter should do the job, though I'll leave the old code here for now.
networkManagers = (List<Object>) networkMarkers.get(serverConnection);
// networkManagers = (List<Object>) getNetworkMarkers.invoke(null, serverConnection);
createServerChannelHandler(); createServerChannelHandler();
// Find the correct list, or implicitly throw an exception // Find the correct list, or implicitly throw an exception