Fixed condition setting incorrect effect values

Auxilor · Feb 21, 2021 · 067d810 · 067d810
1 parent 87b024c
commit 067d810
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 68 deletions.
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/Condition.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/Condition.java
@@ -1,6 +1,9 @@
 package com.willfp.ecoarmor.conditions;
 
 import com.willfp.ecoarmor.EcoArmorPlugin;
+import com.willfp.ecoarmor.effects.Effect;
+import com.willfp.ecoarmor.sets.ArmorSet;
+import com.willfp.ecoarmor.sets.util.ArmorUtils;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.entity.Player;
@@ -54,4 +57,29 @@ public final boolean isMet(@NotNull final Player player,
 
     protected abstract boolean isConditionMet(@NotNull Player player,
                                               @NotNull T value);
+
+    protected final void evaluateEffects(@NotNull final Player player,
+                                         @NotNull final T value,
+                                         @NotNull final ArmorSet set) {
+        this.getPlugin().getScheduler().runLater(() -> {
+            if (isMet(player, value)) {
+                for (Effect<?> effect : set.getEffects().keySet()) {
+                    Object strength = set.getEffectStrength(effect);
+
+                    if (ArmorUtils.isWearingAdvanced(player)) {
+                        Object advancedStrength = set.getAdvancedEffectStrength(effect);
+                        if (advancedStrength != null) {
+                            strength = advancedStrength;
+                        }
+                    }
+
+                    if (strength != null) {
+                        effect.enable(player, strength);
+                    }
+                }
+            } else {
+                set.getEffects().keySet().forEach(effect -> effect.disable(player));
+            }
+        }, 1);
+    }
 }
diff --git a/.../src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveHealthPercent.java b/.../src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveHealthPercent.java
@@ -39,13 +39,7 @@ public void listener(@NotNull final EntityRegainHealthEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @EventHandler(
@@ -71,13 +65,7 @@ public void listener(@NotNull final EntityDamageEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/...plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveXPLevel.java b/...plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveXPLevel.java
@@ -33,13 +33,7 @@ public void listener(@NotNull final PlayerExpChangeEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/.../core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveY.java b/.../core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveY.java
@@ -33,13 +33,7 @@ public void listener(@NotNull final PlayerMoveEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/.../src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowHealthPercent.java b/.../src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowHealthPercent.java
@@ -39,13 +39,7 @@ public void listener(@NotNull final EntityRegainHealthEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @EventHandler(
@@ -71,11 +65,7 @@ public void listener(@NotNull final EntityDamageEvent event) {
             return;
         }
 
-        if (isMet(player, value)) {
-            set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-        } else {
-            set.getEffects().keySet().forEach(effect -> effect.disable(player));
-        }
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/...plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowXPLevel.java b/...plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowXPLevel.java
@@ -33,13 +33,7 @@ public void listener(@NotNull final PlayerExpChangeEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/.../core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java b/.../core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java
@@ -33,13 +33,7 @@ public void listener(@NotNull final PlayerMoveEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/...core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWater.java b/...core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWater.java
@@ -34,13 +34,7 @@ public void listener(@NotNull final PlayerMoveEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override

diff --git a/...core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWorld.java b/...core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWorld.java
@@ -37,13 +37,7 @@ public void listener(@NotNull final PlayerMoveEvent event) {
             return;
         }
 
-        this.getPlugin().getScheduler().runLater(() -> {
-            if (isMet(player, value)) {
-                set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
-            } else {
-                set.getEffects().keySet().forEach(effect -> effect.disable(player));
-            }
-        }, 1);
+        evaluateEffects(player, value, set);
     }
 
     @Override