diff --git a/.gitignore b/.gitignore index 4e0bcbaa2..b0a8a01d7 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,9 @@ updateMirror.sh **/target/* */lib/* nms_build/ + + +.factorypath +.settings/ +bin/ +tmp/ diff --git a/NEXT_RELEASE_CHANGELOG.md b/NEXT_RELEASE_CHANGELOG.md index e69de29bb..961302d5c 100644 --- a/NEXT_RELEASE_CHANGELOG.md +++ b/NEXT_RELEASE_CHANGELOG.md @@ -0,0 +1 @@ +- Fix support for version before MC 1.16.5. diff --git a/core/pom.xml b/core/pom.xml index d46927ac9..2873b85f0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -258,7 +258,7 @@ net.bytebuddy byte-buddy ${dependency.bytebuddy.version} - provided + compile @@ -408,6 +408,10 @@ com.github.Anon8281.universalScheduler nl.pim16aap2.bigDoors.lib.universalScheduler + + net.bytebuddy + nl.pim16aap2.bigDoors.lib.bytebuddy + diff --git a/core/src/main/java/nl/pim16aap2/bigDoors/compatibility/FakePlayerClassGenerator.java b/core/src/main/java/nl/pim16aap2/bigDoors/compatibility/FakePlayerClassGenerator.java index 7e22e1d1c..ae141b0f5 100644 --- a/core/src/main/java/nl/pim16aap2/bigDoors/compatibility/FakePlayerClassGenerator.java +++ b/core/src/main/java/nl/pim16aap2/bigDoors/compatibility/FakePlayerClassGenerator.java @@ -436,7 +436,7 @@ private static Map getMethods(Class clz) */ private DynamicType.Builder addMethodGetWorld(DynamicType.Builder currentBuilder, Map methods) { - final Method method = findMethod(Player.class).withName("getWorld").checkInterfaces().get(); + final Method method = findMethod(Player.class).findMultiple().atLeast(1).withName("getWorld").checkInterfaces().get().get(0); final Method target = findMethod(Location.class).withName("getWorld").get(); if (methods.remove(simpleMethodString(method)) == null) throw new IllegalStateException("Failed to find mapped method: " + method); diff --git a/pom.xml b/pom.xml index aa4c35c86..5762f5902 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 3.4.0 3.5.4 - 27883fb37a + f401ec771c com.github.PimvanderLoos