From 065cd1a4f35ac5b64989e8a74cc03a3733d6d964 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 5 Sep 2021 11:48:36 +0100
Subject: [PATCH] Urgent fix

---
 .../kotlin/com/willfp/ecoskills/data/DataListener.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
index 9bc9609..304fb13 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/DataListener.kt
@@ -63,9 +63,13 @@ private fun Player.convertFromLegacyData() {
     }
     for (skill in Skills.values()) {
         plugin.dataYml.set("player.${this.uniqueId}.${skill.id}", this.getSkillLevel(skill))
-        plugin.dataYml.set(
-            "player.${this.uniqueId}.${skill.xpKey.key}",
-            this.persistentDataContainer.getOrDefault(skill.xpKey, PersistentDataType.DOUBLE, 0.0)
-        )
+        val prog = this.persistentDataContainer.get(skill.xpKey, PersistentDataType.DOUBLE)
+        if (prog != null) {
+            plugin.dataYml.set(
+                "player.${this.uniqueId}.${skill.xpKey.key}",
+                prog
+            )
+            this.persistentDataContainer.remove(skill.xpKey)
+        }
     }
 }
\ No newline at end of file