diff --git a/src/com/djrapitops/plan/command/hooks/AdvancedAchievementsHook.java b/src/com/djrapitops/plan/command/hooks/AdvancedAchievementsHook.java index 9acd661ee..41f95b511 100644 --- a/src/com/djrapitops/plan/command/hooks/AdvancedAchievementsHook.java +++ b/src/com/djrapitops/plan/command/hooks/AdvancedAchievementsHook.java @@ -96,4 +96,7 @@ public class AdvancedAchievementsHook implements Hook { return getData(player); } + public boolean isUsingUUID() { + return usingUUID; + } } diff --git a/src/com/djrapitops/plan/command/utils/DataUtils.java b/src/com/djrapitops/plan/command/utils/DataUtils.java index c26383cba..5c948f764 100644 --- a/src/com/djrapitops/plan/command/utils/DataUtils.java +++ b/src/com/djrapitops/plan/command/utils/DataUtils.java @@ -1,6 +1,7 @@ package com.djrapitops.plan.command.utils; import com.djrapitops.plan.Plan; +import com.djrapitops.plan.command.hooks.AdvancedAchievementsHook; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -79,7 +80,16 @@ public class DataUtils { "TOW-LAST LOGIN", "TOW-OWNER OF", "TOW-PLOT PERMS", "TOW-PLOT OPTIONS", "TOW-FRIENDS", "ESS-ONLINE SINCE", "ESS-OFFLINE SINCE"}; List ignoreKeys = new ArrayList<>(); + try { + AdvancedAchievementsHook aaHook = (AdvancedAchievementsHook) plugin.getHooks().get("AdvancedAchievements"); + if (!aaHook.isUsingUUID()) { + ignoreKeys.add("AAC-ACHIEVEMENTS"); + } + } catch (Exception e) { + ignoreKeys.add("AAC-ACHIEVEMENTS"); + } ignoreKeys.addAll(Arrays.asList(ignore)); + for (UUID key : playerData.keySet()) { for (String dataKey : playerData.get(key).keySet()) { if (ignoreKeys.contains(dataKey)) {