diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java index 4c66103..ea26f21 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java @@ -28,6 +28,12 @@ public class TalismansPlugin extends EcoPlugin { @Getter private static TalismansPlugin instance; + /** + * If bag from TalismansGUI plugin is used or not. + */ + @Getter + private static boolean bagLoaded; + /** * Internal constructor called by bukkit on plugin load. */ @@ -38,6 +44,14 @@ public class TalismansPlugin extends EcoPlugin { @Override protected void handleEnable() { + + if (this.getServer().getPluginManager().getPlugin("TalismansGUI") != null){ + bagLoaded = this.getServer().getPluginManager().getPlugin("TalismansGUI").getDescription().getVersion().compareTo("1.3") >= 0; + } + else { + bagLoaded = false; + } + this.getLogger().info(Talismans.values().size() + " Talismans Loaded"); } 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 acf7695..d41b6f9 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 @@ -7,6 +7,8 @@ import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.TalismanLevel; import com.willfp.talismans.talismans.Talismans; import lombok.experimental.UtilityClass; +import me.often.talismansgui.Utils.BagUtils; +import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.block.BlockState; import org.bukkit.block.ShulkerBox; @@ -224,6 +226,10 @@ public class TalismanChecks { } } + if (TalismansPlugin.isBagLoaded()){ + found.addAll(BagUtils.getBag(player)); + } + if (useCache) { CACHED_TALISMANS.put(player.getUniqueId(), found); PLUGIN.getScheduler().runLater(() -> CACHED_TALISMANS.remove(player.getUniqueId()), 40);