From a14360497828e8e5937b3983252592e8b93dd1fb Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 21 Feb 2021 11:06:20 +0000 Subject: [PATCH] Optimised effect system --- .../conditions/ConditionBelowY.java | 2 +- .../com/willfp/ecoarmor/effects/Effect.java | 25 +++++++++++------- .../effects/AttackSpeedMultiplier.java | 3 +-- .../ecoarmor/effects/effects/BonusHearts.java | 3 +-- .../effects/effects/BowDamageMultiplier.java | 7 +---- .../effects/effects/DamageMultiplier.java | 7 +---- .../effects/DamageTakenMultiplier.java | 7 +---- .../effects/effects/DurabilityMultiplier.java | 7 +---- .../ecoarmor/effects/effects/EvadeChance.java | 7 +---- .../effects/effects/ExperienceMultiplier.java | 7 +---- .../effects/effects/FallDamageMultiplier.java | 7 +---- .../effects/effects/HungerLossMultiplier.java | 7 +---- .../effects/MeleeDamageMultiplier.java | 6 +---- .../effects/RegenerationMultiplier.java | 7 +---- .../effects/effects/SpeedMultiplier.java | 3 +-- .../effects/TridentDamageMultiplier.java | 6 +---- .../ecoarmor/effects/effects/WarpChance.java | 3 +-- .../ecoarmor/effects/util/EffectWatcher.java | 26 +++++++++++++------ .../willfp/ecoarmor/sets/util/ArmorUtils.java | 25 ------------------ 19 files changed, 49 insertions(+), 116 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java index cd8f8f1..b525b62 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java @@ -30,7 +30,7 @@ public class ConditionBelowY extends Condition { } if (isMet(player, value)) { - set.getEffects().keySet().forEach(effect -> effect.enable(player)); + set.getEffects().keySet().forEach(effect -> effect.enable(player, value)); } else { set.getEffects().keySet().forEach(effect -> effect.disable(player)); } 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 79a15c4..9df98ec 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 @@ -6,9 +6,10 @@ import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -import java.util.HashSet; -import java.util.Set; +import java.util.HashMap; +import java.util.Map; import java.util.UUID; public abstract class Effect implements Listener { @@ -45,7 +46,7 @@ public abstract class Effect implements Listener { /** * Players that the effect is currently enabled for. */ - private final Set enabledPlayers = new HashSet<>(); + private final Map enabledPlayers = new HashMap<>(); /** * Create a new effect. @@ -62,27 +63,31 @@ public abstract class Effect implements Listener { update(); Effects.addNewEffect(this); } + /** - * Get if effect is enabled for player. + * Get the effect strength for a player. * * @param player The player. - * @return If enabled. + * @return The strength. */ - public final boolean isEnabledForPlayer(@NotNull final Player player) { - return enabledPlayers.contains(player.getUniqueId()); + @Nullable + public final T getStrengthForPlayer(@NotNull final Player player) { + return enabledPlayers.get(player.getUniqueId()); } /** * Enable the effect for a player. * * @param player The player. + * @param value The strength. */ - public final void enable(@NotNull final Player player) { - if (enabledPlayers.contains(player.getUniqueId())) { + public final void enable(@NotNull final Player player, + @NotNull final Object value) { + if (enabledPlayers.containsKey(player.getUniqueId())) { return; } - enabledPlayers.add(player.getUniqueId()); + enabledPlayers.put(player.getUniqueId(), typeClass.cast(value)); this.onEnable(player); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/AttackSpeedMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/AttackSpeedMultiplier.java index de3513b..8e2b513 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/AttackSpeedMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/AttackSpeedMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeModifier; @@ -18,7 +17,7 @@ public class AttackSpeedMultiplier extends Effect { AttributeInstance maxHealth = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED); assert maxHealth != null; - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BonusHearts.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BonusHearts.java index 5a07b98..a27dbd2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BonusHearts.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BonusHearts.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeModifier; @@ -18,7 +17,7 @@ public class BonusHearts extends Effect { AttributeInstance maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH); assert maxHealth != null; - Integer bonus = ArmorUtils.getEffectStrength(player, this); + Integer bonus = this.getStrengthForPlayer(player); if (bonus == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java index d27b23f..e96bc07 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Arrow; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; @@ -33,11 +32,7 @@ public class BowDamageMultiplier extends Effect { Player player = (Player) shooter; - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageMultiplier.java index a709b30..c63dece 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; @@ -38,11 +37,7 @@ public class DamageMultiplier extends Effect { return; } - if (!this.isEnabledForPlayer(attacker)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(attacker, this); + Double multiplier = this.getStrengthForPlayer(attacker); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageTakenMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageTakenMultiplier.java index f74b29f..c01380f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageTakenMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DamageTakenMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent; @@ -24,11 +23,7 @@ public class DamageTakenMultiplier extends Effect { Player player = (Player) event.getEntity(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DurabilityMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DurabilityMultiplier.java index daf6103..946399a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DurabilityMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/DurabilityMultiplier.java @@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerItemDamageEvent; @@ -21,11 +20,7 @@ public class DurabilityMultiplier extends Effect { Player player = event.getPlayer(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/EvadeChance.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/EvadeChance.java index c71bd6b..2968771 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/EvadeChance.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/EvadeChance.java @@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent; @@ -25,11 +24,7 @@ public class EvadeChance extends Effect { Player player = (Player) event.getEntity(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double chance = ArmorUtils.getEffectStrength(player, this); + Double chance = this.getStrengthForPlayer(player); if (chance == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/ExperienceMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/ExperienceMultiplier.java index aee6008..06bbe4e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/ExperienceMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/ExperienceMultiplier.java @@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.jetbrains.annotations.NotNull; @@ -16,15 +15,11 @@ public class ExperienceMultiplier extends Effect { public void listener(@NotNull final NaturalExpGainEvent event) { Player player = event.getExpChangeEvent().getPlayer(); - if (!this.isEnabledForPlayer(player)) { - return; - } - if (event.getExpChangeEvent().getAmount() < 0) { return; } - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/FallDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/FallDamageMultiplier.java index 578e47c..d940f7b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/FallDamageMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/FallDamageMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent; @@ -28,11 +27,7 @@ public class FallDamageMultiplier extends Effect { Player player = (Player) event.getEntity(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/HungerLossMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/HungerLossMultiplier.java index 43ec8e5..bd71fb1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/HungerLossMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/HungerLossMultiplier.java @@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.FoodLevelChangeEvent; @@ -21,11 +20,7 @@ public class HungerLossMultiplier extends Effect { Player player = (Player) event.getEntity(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/MeleeDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/MeleeDamageMultiplier.java index 0055713..f4fc350 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/MeleeDamageMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/MeleeDamageMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -24,11 +23,8 @@ public class MeleeDamageMultiplier extends Effect { Player attacker = (Player) event.getDamager(); - if (!this.isEnabledForPlayer(attacker)) { - return; - } + Double multiplier = this.getStrengthForPlayer(attacker); - Double multiplier = ArmorUtils.getEffectStrength(attacker, this); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/RegenerationMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/RegenerationMultiplier.java index 3602b72..1c63969 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/RegenerationMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/RegenerationMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityRegainHealthEvent; @@ -24,11 +23,7 @@ public class RegenerationMultiplier extends Effect { Player player = (Player) event.getEntity(); - if (!this.isEnabledForPlayer(player)) { - return; - } - - Double multiplier = ArmorUtils.getEffectStrength(player, this); + Double multiplier = this.getStrengthForPlayer(player); if (multiplier == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/SpeedMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/SpeedMultiplier.java index acdc6e5..ff2cd88 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/SpeedMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/SpeedMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeModifier; @@ -18,7 +17,7 @@ public class SpeedMultiplier extends Effect { AttributeInstance movementSpeed = player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED); assert movementSpeed != null; - Double strength = ArmorUtils.getEffectStrength(player, this); + Double strength = this.getStrengthForPlayer(player); if (strength == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java index e2a99c0..5a272a7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java @@ -1,7 +1,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.Trident; @@ -33,11 +32,8 @@ public class TridentDamageMultiplier extends Effect { Player player = (Player) shooter; - if (!this.isEnabledForPlayer(player)) { - return; - } + Double multiplier = this.getStrengthForPlayer(player); - Double multiplier = ArmorUtils.getEffectStrength(player, this); if (multiplier == null) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/WarpChance.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/WarpChance.java index d3836aa..bf06ecb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/WarpChance.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/WarpChance.java @@ -2,7 +2,6 @@ package com.willfp.ecoarmor.effects.effects; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoarmor.effects.Effect; -import com.willfp.ecoarmor.sets.util.ArmorUtils; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; @@ -34,7 +33,7 @@ public class WarpChance extends Effect { Player player = (Player) event.getDamager(); LivingEntity victim = (LivingEntity) event.getEntity(); - Double chance = ArmorUtils.getEffectStrength(player, this); + Double chance = this.getStrengthForPlayer(player); if (chance == null) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/util/EffectWatcher.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/util/EffectWatcher.java index eb64696..b578425 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/util/EffectWatcher.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/util/EffectWatcher.java @@ -38,19 +38,29 @@ public class EffectWatcher extends PluginDependent implements Listener { boolean enabled = true; if (set == null) { - enabled = false; - } else { - if (set.getEffectStrength(effect) == null) { - enabled = false; - } + effect.disable(player); + continue; + } - if (!ArmorUtils.areConditionsMet(player)) { - enabled = false; + Object strength = set.getEffectStrength(effect); + + if (ArmorUtils.isWearingAdvanced(player)) { + Object advancedStrength = set.getAdvancedEffectStrength(effect); + if (advancedStrength != null) { + strength = advancedStrength; } } + if (strength == null) { + enabled = false; + } + + if (!ArmorUtils.areConditionsMet(player)) { + enabled = false; + } + if (enabled) { - effect.enable(player); + effect.enable(player, strength); } else { effect.disable(player); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java index 984d28b..06029f2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java @@ -98,31 +98,6 @@ public class ArmorUtils { return null; } - /** - * Get the strength of an effect on a player's set. - * - * @param player The player to test. - * @param effect The effect to test. - * @param Effect type. - * @return The strength, or null if not found. - */ - @Nullable - public T getEffectStrength(@NotNull final Player player, - @NotNull final Effect effect) { - ArmorSet set = getSetOnPlayer(player); - if (set == null) { - return null; - } - - T strength = set.getEffectStrength(effect); - - if (isWearingAdvanced(player)) { - strength = set.getAdvancedEffectStrength(effect); - } - - return strength; - } - /** * Get if all conditions are met for a player. *