HarvelsX 3 years ago
parent 0bfdc4d528
commit 84c251fa68
No known key found for this signature in database
GPG Key ID: 9637BCFE856BB8F3

@ -164,6 +164,7 @@ public class PlayerSetter {
= DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements()); = DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements());
if (Settings.useNativeImplementation) { if (Settings.useNativeImplementation) {
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
try { try {
nativeSyncPlayerAdvancements(player, advancementRecords); nativeSyncPlayerAdvancements(player, advancementRecords);
} catch (Exception e) { } catch (Exception e) {
@ -176,6 +177,7 @@ public class PlayerSetter {
setPlayerAdvancements(player, advancementRecords, data); setPlayerAdvancements(player, advancementRecords, data);
plugin.getLogger().log(Level.SEVERE, e.getMessage(), e); plugin.getLogger().log(Level.SEVERE, e.getMessage(), e);
} }
});
} else { } else {
setPlayerAdvancements(player, advancementRecords, data); setPlayerAdvancements(player, advancementRecords, data);
} }
@ -313,9 +315,11 @@ public class PlayerSetter {
} }
}); });
synchronized (playerAdvancements) {
AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements); AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements);
AdvancementUtils.ensureAllVisible(playerAdvancements); AdvancementUtils.ensureAllVisible(playerAdvancements);
} }
}
/** /**
* Update a player's advancements and progress to match the advancementData * Update a player's advancements and progress to match the advancementData

@ -13,7 +13,7 @@ public class MinecraftVersionUtils {
public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0]; public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0];
public static int compare(String version) { public static int compare(String version) {
if (version == null) return 1; if (version == null || SERVER_VERSION == null) return 1;
String[] as = SERVER_VERSION.split("\\."); String[] as = SERVER_VERSION.split("\\.");
String[] bs = version.split("\\."); String[] bs = version.split("\\.");

Loading…
Cancel
Save