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

Merge pull request #5

Browse Source 
TalismansGUI internal bag support
This commit is contained in:
Auxilor
2021-08-04 20:09:53 +01:00
committed by GitHub
parent a93b590c16 9bde077036
commit 2483a05d92
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");
}

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

@@ -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);