Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-26 01:59:20 +00:00
Code Issues Releases 1 Activity

Maybe fix https://github.com/HarvelsX/HuskSync/issues/1;

Browse Source
This commit is contained in:
HarvelsX
2021-12-25 11:50:39 +03:00
parent 0bfdc4d528
commit 84c251fa68
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
View File

@@ -164,18 +164,20 @@ 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());
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 {0}. Please disable using native implementation!", Bukkit.getVersion());
Settings.useNativeImplementation = false;
setPlayerAdvancements(player, advancementRecords, data);
plugin.getLogger().log(Level.SEVERE, e.getMessage(), e);
}
Settings.useNativeImplementation = false;
setPlayerAdvancements(player, advancementRecords, data);
plugin.getLogger().log(Level.SEVERE, e.getMessage(), e);
}
});
} else {
setPlayerAdvancements(player, advancementRecords, data);
}
@@ -313,8 +315,10 @@ public class PlayerSetter {
}
});
AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements);
AdvancementUtils.ensureAllVisible(playerAdvancements);
synchronized (playerAdvancements) {
AdvancementUtils.markPlayerAdvancementsFirst(playerAdvancements);
AdvancementUtils.ensureAllVisible(playerAdvancements);
}
}
/**

2
bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java
View File

@@ -13,7 +13,7 @@ public class MinecraftVersionUtils {
public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0];
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[] bs = version.split("\\.");