Fix getEntityModifier() for MPCP 1.6.2.

ProtocolLib/src/main/java/com/comphenix/protocol/injector/EntityUtilities.java

@@ -21,8 +21,8 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -35,6 +35,7 @@ import org.bukkit.entity.Player;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.google.common.collect.Lists;
 
@@ -211,18 +212,14 @@ class EntityUtilities {
 			try {
 				hashGetMethod = type.getMethod("get", int.class);
 			} catch (NoSuchMethodException e) {
-			
+				// Then it's probably the lowest named method that takes an int-parameter and returns a object
-				Class<?>[] params = { int.class };
+				hashGetMethod = FuzzyReflection.fromClass(type).getMethod(
-				
+					FuzzyMethodContract.newBuilder().banModifier(Modifier.STATIC).
-				// Then it's probably the lowest named method that takes an int-parameter
+					parameterCount(1).
-				for (Method method : type.getMethods()) {
+					parameterExactType(int.class).
-					if (Arrays.equals(params, method.getParameterTypes())) {
+					returnTypeExact(Object.class).
-						if (hashGetMethod == null ||
+					build()
-							method.getName().compareTo(hashGetMethod.getName()) < 0) {
+				);
-							hashGetMethod = method;
-						}
-					}
-				}
 			}
 		}