diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java b/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java index b6dfbddd..73b66f35 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java @@ -26,7 +26,7 @@ public class ConfigLoader { Settings.syncFlight = config.getBoolean("synchronisation_settings.flight", false); // Future - Settings.useNativeImplementation = config.getBoolean("useNativeImplementation", false); + Settings.useNativeImplementation = config.getBoolean("native_advancement_synchronization", false); } } diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java index 265f1d18..a9c7305f 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java @@ -164,18 +164,18 @@ public class PlayerSetter { = DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements()); if (Settings.useNativeImplementation) { - try { - nativeSyncPlayerAdvancements(player, advancementRecords); - } catch (Exception e) { - plugin.getLogger().log(Level.WARNING, - "Your server does not support a native implementation of achievements synchronization"); - plugin.getLogger().log(Level.WARNING, - "Your server version {0}. Please disable using native implementation!", Bukkit.getVersion()); - - Settings.useNativeImplementation = false; - setPlayerAdvancements(player, advancementRecords, data); - plugin.getLogger().log(Level.SEVERE, e.getMessage(), e); - } + try { + nativeSyncPlayerAdvancements(player, advancementRecords); + } catch (Exception e) { + plugin.getLogger().log(Level.WARNING, + "Your server does not support a native implementation of achievements synchronization"); + plugin.getLogger().log(Level.WARNING, + "Your server version {0}. Please disable using native implementation!", Bukkit.getVersion()); + + Settings.useNativeImplementation = false; + setPlayerAdvancements(player, advancementRecords, data); + plugin.getLogger().log(Level.SEVERE, e.getMessage(), e); + } } else { setPlayerAdvancements(player, advancementRecords, data); } diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java index d02e8bcc..a85ab647 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java @@ -15,7 +15,7 @@ public class EntityUtils { GET_HANDLE = ThrowSupplier.get(() -> CRAFT_ENTITY.getDeclaredMethod("getHandle")); } - public static Object getHandle (LivingEntity livingEntity) throws RuntimeException { + public static Object getHandle(LivingEntity livingEntity) throws RuntimeException { try { return GET_HANDLE.invoke(livingEntity); } catch (IllegalAccessException | InvocationTargetException e) { diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java index 82babcc2..1db45833 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java @@ -8,24 +8,23 @@ public class MinecraftVersionUtils { public final static String CRAFTBUKKIT_PACKAGE_PATH = Bukkit.getServer().getClass().getPackage().getName(); public final static String PACKAGE_VERSION = CRAFTBUKKIT_PACKAGE_PATH.split("\\.")[3]; - public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0]; - public final static String MINECRAFT_PACKAGE = compare("1.17") < 0 ? "net.minecraft.server.".concat(PACKAGE_VERSION) : "net.minecraft.server"; + public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0]; public static int compare(String version) { - if(version == null) return 1; + if (version == null) return 1; String[] as = SERVER_VERSION.split("\\."); String[] bs = version.split("\\."); int length = Math.max(as.length, bs.length); - for(int i = 0; i < length; i++) { + for (int i = 0; i < length; i++) { int a = i < as.length ? Integer.parseInt(as[i]) : 0; int b = i < bs.length ? Integer.parseInt(bs[i]) : 0; - if(a < b) return -1; - if(a > b) return 1; + if (a < b) return -1; + if (a > b) return 1; } return 0;