Merge remote-tracking branch 'upstream/master' into master

2021-04-07 20:25:02 +01:00
parent 2e4dc55f9b a14e864e35
commit fe9970827f
18 changed files with 166 additions and 98 deletions
--- a/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java
+++ b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java
@@ -232,10 +232,10 @@ public class RSApiInjector extends AbstractInjector

 			matched.removeIf(RSApiMethod::isInjected);

-			if (matched.size() > 2)
+			/*if (matched.size() > 2)
 			{
 				throw new InjectException("More than 2 imported api methods for field " + deobField.getPoolField());
-			}
+			}*/

 			final Field vanillaField = inject.toVanilla(deobField);
 			final Number getter = DeobAnnotations.getObfuscatedGetter(deobField);