From efc2c0199bb25fbdccea69513edc6e6ca9f746e3 Mon Sep 17 00:00:00 2001 From: Harvels X Date: Wed, 5 Jan 2022 21:05:13 +0300 Subject: [PATCH] Remove async execution `nativeSyncPlayerAdvancements`; --- .../husksync/bukkit/util/PlayerSetter.java | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) 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 eb4c3a35..658dd54e 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 @@ -20,8 +20,6 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import java.io.IOException; -import java.time.Instant; -import java.time.Period; import java.util.*; import java.util.logging.Level; @@ -164,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); } @@ -310,11 +306,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 } /**