From 115d274fa7660ef02bc6bcd6451ed971908fc1d0 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 5 Mar 2021 13:06:19 +0000
Subject: [PATCH] Fixed persistence bug on 1.15

---
 .../talismans/talismans/util/TalismanChecks.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
index c204f2a..71c59d3 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
@@ -1,6 +1,7 @@
 package com.willfp.talismans.talismans.util;
 
 import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.talismans.TalismansPlugin;
 import com.willfp.talismans.talismans.Talisman;
@@ -97,9 +98,18 @@ public class TalismanChecks {
 
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
-        NamespacedKey talismanKey = container.getKeys().stream().filter(namespacedKey -> namespacedKey.getNamespace().equals("talismans")).findFirst().orElse(null);
+        if (Prerequisite.MINIMUM_1_16.isMet()) {
+            NamespacedKey talismanKey = container.getKeys().stream().filter(namespacedKey -> namespacedKey.getNamespace().equals("talismans")).findFirst().orElse(null);
+            return Talismans.getByKey(talismanKey);
+        } else {
+            for (Talisman talisman : Talismans.values()) {
+                if (container.has(talisman.getKey(), PersistentDataType.INTEGER)) {
+                    return talisman;
+                }
+            }
+        }
 
-        return Talismans.getByKey(talismanKey);
+        return null;
     }
 
     /**