Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Fixed persistence bug on 1.15

Browse Source
This commit is contained in:
Auxilor
2021-03-05 13:06:19 +00:00
parent e350c6fd3c
commit 115d274fa7
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
View File

@@ -1,6 +1,7 @@
package com.willfp.talismans.talismans.util; package com.willfp.talismans.talismans.util;
import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; 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.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.talismans.TalismansPlugin; import com.willfp.talismans.TalismansPlugin;
import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talisman;
@@ -97,9 +98,18 @@ public class TalismanChecks {
PersistentDataContainer container = meta.getPersistentDataContainer(); 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;
} }
/** /**