From 38c7a14d0eedb33699dc955153f13bb879a3d8bd Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Thu, 4 Jun 2020 11:35:12 +0200 Subject: [PATCH] Fetch `CraftServer#unrestrictedAdvancements` only in MC 12 --- .../serverutils/reflection/RCraftServer.java | 2 +- .../serverutils/reflection/ReflectionUtils.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/frankheijden/serverutils/reflection/RCraftServer.java b/src/main/java/net/frankheijden/serverutils/reflection/RCraftServer.java index 4d3581a..2bed733 100644 --- a/src/main/java/net/frankheijden/serverutils/reflection/RCraftServer.java +++ b/src/main/java/net/frankheijden/serverutils/reflection/RCraftServer.java @@ -39,7 +39,7 @@ public class RCraftServer { fieldOf("console", ALL_VERSIONS), fieldOf("commandsConfiguration", ALL_VERSIONS), fieldOf("overrideAllCommandBlockCommands", ALL_VERSIONS), - fieldOf("unrestrictedAdvancements", max(12)), + fieldOf("unrestrictedAdvancements", versionOf(12)), fieldOf("ignoreVanillaPermissions", min(13)), fieldOf("monsterSpawn", ALL_VERSIONS), fieldOf("animalSpawn", ALL_VERSIONS), diff --git a/src/main/java/net/frankheijden/serverutils/reflection/ReflectionUtils.java b/src/main/java/net/frankheijden/serverutils/reflection/ReflectionUtils.java index 7958afe..038458d 100644 --- a/src/main/java/net/frankheijden/serverutils/reflection/ReflectionUtils.java +++ b/src/main/java/net/frankheijden/serverutils/reflection/ReflectionUtils.java @@ -108,16 +108,20 @@ public class ReflectionUtils { this.max = max; } - public static VersionParam versionOf(int min, int max) { + public static VersionParam versionOf(int ver) { + return new VersionParam(ver, ver); + } + + public static VersionParam between(int min, int max) { return new VersionParam(min, max); } public static VersionParam min(int min) { - return versionOf(min, Integer.MAX_VALUE); + return between(min, Integer.MAX_VALUE); } public static VersionParam max(int max) { - return versionOf(Integer.MIN_VALUE, max); + return between(Integer.MIN_VALUE, max); } public boolean isCompatible() {