From 8d1714f88676d63b1db34f75dfcdb33c2a1fd1af Mon Sep 17 00:00:00 2001 From: Jules Date: Sun, 25 Jun 2023 23:05:28 +0200 Subject: [PATCH] 'can-mine' is now optional for tool restricts --- .../java/net/Indyuce/mmocore/manager/RestrictionManager.java | 5 +++-- .../Indyuce/mmocore/manager/profession/FishingManager.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java index 4d06cdc6..6cc6f02b 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java @@ -115,8 +115,9 @@ public class RestrictionManager implements MMOCoreManager { String parentFormat = formatId(config.getString("parent")); parent = Objects.requireNonNull(map.get(parentFormat), "Could not find parent with ID '" + parentFormat + "'"); } - for (String key : config.getStringList("can-mine")) - mineable.add(MMOCore.plugin.loadManager.loadBlockType(new MMOLineConfig(key)).generateKey()); + if (config.contains("can-mine")) + for (String key : config.getStringList("can-mine")) + mineable.add(MMOCore.plugin.loadManager.loadBlockType(new MMOLineConfig(key)).generateKey()); } /** diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java index 410274e0..48c79e28 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java @@ -39,6 +39,7 @@ public class FishingManager extends SpecificProfessionManager { MMOCore.plugin.statManager.registerProfession("CRITICAL_FISHING_FAILURE_CHANCE", getLinkedProfession()); } + @NotNull public FishingDropTable calculateDropTable(@NotNull Player player, @NotNull FishHook hook) { ConditionInstance conditionEntity = new ConditionInstance(player, hook.getLocation());