From ce8490f8142af43cd772ba8cf183b9493dfcad47 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sat, 10 Dec 2016 00:27:03 +0200
Subject: [PATCH] 1.4.2 Final version

Added a check to Analyze if AAHook is UsingUUID.
---
 .../plan/command/hooks/AdvancedAchievementsHook.java   |  3 +++
 src/com/djrapitops/plan/command/utils/DataUtils.java   | 10 ++++++++++
 2 files changed, 13 insertions(+)

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<String> 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)) {