From c26798e57227ad8d7f92e4a263ebcea3f27310fd Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 21 Feb 2021 11:45:34 +0000 Subject: [PATCH] Minor changes --- .../src/main/java/com/willfp/ecoarmor/effects/Effect.java | 4 ++++ eco-core/core-plugin/src/main/resources/sets/ender.yml | 1 + eco-core/core-plugin/src/main/resources/sets/miner.yml | 1 + eco-core/core-plugin/src/main/resources/sets/reaper.yml | 1 + 4 files changed, 7 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effect.java index 9df98ec..72863c4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effect.java @@ -83,6 +83,10 @@ public abstract class Effect implements Listener { */ public final void enable(@NotNull final Player player, @NotNull final Object value) { + if (!this.isEnabled()) { + return; + } + if (enabledPlayers.containsKey(player.getUniqueId())) { return; } diff --git a/eco-core/core-plugin/src/main/resources/sets/ender.yml b/eco-core/core-plugin/src/main/resources/sets/ender.yml index 8ef9a22..cac7f15 100644 --- a/eco-core/core-plugin/src/main/resources/sets/ender.yml +++ b/eco-core/core-plugin/src/main/resources/sets/ender.yml @@ -1,4 +1,5 @@ enabled: true +conditions: [] set-bonus: - "warp-chance: 20" - "evade-chance: 10" diff --git a/eco-core/core-plugin/src/main/resources/sets/miner.yml b/eco-core/core-plugin/src/main/resources/sets/miner.yml index 62c5436..ca661b1 100644 --- a/eco-core/core-plugin/src/main/resources/sets/miner.yml +++ b/eco-core/core-plugin/src/main/resources/sets/miner.yml @@ -1,4 +1,5 @@ enabled: true +conditions: [] set-bonus: - "experience-multiplier: 1.25" advanced-set-bonus: diff --git a/eco-core/core-plugin/src/main/resources/sets/reaper.yml b/eco-core/core-plugin/src/main/resources/sets/reaper.yml index 651a937..a293644 100644 --- a/eco-core/core-plugin/src/main/resources/sets/reaper.yml +++ b/eco-core/core-plugin/src/main/resources/sets/reaper.yml @@ -1,4 +1,5 @@ enabled: true +conditions: [] set-bonus: - "damage-multiplier: 1.25" advanced-set-bonus: