Merge branch 'future/nms'

bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java

@@ -162,20 +162,18 @@ public class PlayerSetter {
                             = DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements());
 
                     if (Settings.useNativeImplementation) {
-                        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                            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 is {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 is {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);
                     }
@@ -282,7 +280,7 @@ public class PlayerSetter {
         final Object playerAdvancements = AdvancementUtils.getPlayerAdvancements(player);
 
         // Clear
-        AdvancementUtils.clearPlayerAdvancements(playerAdvancements);
+	    AdvancementUtils.clearPlayerAdvancements(playerAdvancements);
         AdvancementUtils.clearVisibleAdvancements(playerAdvancements);
 
         advancementRecords.forEach(advancementRecord -> {
@@ -309,10 +307,8 @@ public class PlayerSetter {
                 AdvancementUtils.startProgress(playerAdvancements, advancement, nativeAdvancementProgress);
             }
         });
-        synchronized (playerAdvancements) {
-            AdvancementUtils.ensureAllVisible(playerAdvancements); // Set all completed advancement is visible
-            AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements); // Mark the sending of visible advancement as the first
-        }
+        AdvancementUtils.ensureAllVisible(playerAdvancements); // Set all completed advancement is visible
+        AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements); // Mark the sending of visible advancement as the first
     }
 
     /**