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 22007767..8a978748 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 @@ -163,8 +163,7 @@ public class PlayerSetter { ArrayList advancementRecords = DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements()); - if (Settings.useNativeImplementation) - Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + if (Settings.useNativeImplementation) { try { nativeSyncPlayerAdvancements(player, advancementRecords); } catch (Exception e) { @@ -175,10 +174,11 @@ public class PlayerSetter { Settings.useNativeImplementation = false; setPlayerAdvancements(player, advancementRecords, data); - plugin.getLogger().fine(e.toString()); + plugin.getLogger().log(Level.SEVERE, e.getMessage(), e); } - }); - else setPlayerAdvancements(player, advancementRecords, data); + } else { + setPlayerAdvancements(player, advancementRecords, data); + } } if (Settings.syncInventories) { setPlayerInventory(player, DataSerializer.deserializeInventory(data.getSerializedInventory())); @@ -293,7 +293,7 @@ public class PlayerSetter { Advancement bukkitAdvancement = Bukkit.getAdvancement(namespacedKey); if (bukkitAdvancement == null) { - // todo: write logging + plugin.getLogger().log(Level.WARNING, "Ignored advancement '{0}' - it doesn't exist anymore?", namespacedKey); return; } diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java index c64ada2d..4d4b40ec 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java @@ -65,7 +65,7 @@ public class AdvancementUtils { } } - public static Object getPlayerAdvancements (Player player) { + public static Object getPlayerAdvancements(Player player) { Object nativePlayer = EntityUtils.getHandle(player); try { return PLAYER_ADVANCEMENTS.get(nativePlayer); @@ -74,16 +74,16 @@ public class AdvancementUtils { } } - public static void clearPlayerAdvancementsMap (final Object playerAdvancement) { + public static void clearPlayerAdvancementsMap(final Object playerAdvancement) { try { - ((Map) PLAYER_ADVANCEMENTS_MAP.get(playerAdvancement)) + ((Map) PLAYER_ADVANCEMENTS_MAP.get(playerAdvancement)) .clear(); } catch (IllegalAccessException e) { throw new RuntimeException(e.getMessage(), e); } } - public static Object getHandle (Advancement advancement) { + public static Object getHandle(Advancement advancement) { try { return GET_HANDLE.invoke(advancement); } catch (IllegalAccessException | InvocationTargetException e) { @@ -91,7 +91,7 @@ public class AdvancementUtils { } } - public static Object newCriterionProgress (final Date date) { + public static Object newCriterionProgress(final Date date) { try { Object nativeCriterionProgress = CRITERION_PROGRESS.getDeclaredConstructor().newInstance(); CRITERIA_DATE.set(nativeCriterionProgress, date); @@ -101,7 +101,7 @@ public class AdvancementUtils { } } - public static Object newAdvancementProgress (final Map criteria) { + public static Object newAdvancementProgress(final Map criteria) { try { Object nativeAdvancementProgress = ADVANCEMENT_PROGRESS.getDeclaredConstructor().newInstance(); @@ -114,7 +114,7 @@ public class AdvancementUtils { } } - public static void startProgress (final Object playerAdvancements, final Object advancement, final Object advancementProgress) { + public static void startProgress(final Object playerAdvancements, final Object advancement, final Object advancementProgress) { try { START_PROGRESS.invoke(playerAdvancements, advancement, advancementProgress); } catch (IllegalAccessException | InvocationTargetException e) { @@ -122,7 +122,7 @@ public class AdvancementUtils { } } - public static void ensureAllVisible (final Object playerAdvancements) { + public static void ensureAllVisible(final Object playerAdvancements) { try { ENSURE_ALL_VISIBLE.invoke(playerAdvancements); } catch (IllegalAccessException | InvocationTargetException e) {