Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-28 11:29:18 +00:00
Code Issues Releases 1 Activity

Fixed condition setting incorrect effect values

Browse Source
This commit is contained in:
Auxilor
2021-02-21 12:14:56 +00:00
parent 87b024cf0f
commit 067d810ee1
9 changed files with 38 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/Condition.java
View File

@@ -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 abstract class Condition<T> implements Listener {
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);
}
}

16
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveHealthPercent.java
View File

@@ -39,13 +39,7 @@ public class ConditionAboveHealthPercent extends Condition<Double> {
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 class ConditionAboveHealthPercent extends Condition<Double> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveXPLevel.java
View File

@@ -33,13 +33,7 @@ public class ConditionAboveXPLevel extends Condition<Integer> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionAboveY.java
View File

@@ -33,13 +33,7 @@ public class ConditionAboveY extends Condition<Double> {
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

14
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowHealthPercent.java
View File

@@ -39,13 +39,7 @@ public class ConditionBelowHealthPercent extends Condition<Double> {
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 class ConditionBelowHealthPercent extends Condition<Double> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowXPLevel.java
View File

@@ -33,13 +33,7 @@ public class ConditionBelowXPLevel extends Condition<Integer> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionBelowY.java
View File

@@ -33,13 +33,7 @@ public class ConditionBelowY extends Condition<Double> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWater.java
View File

@@ -34,13 +34,7 @@ public class ConditionInWater extends Condition<Boolean> {
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

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/conditions/conditions/ConditionInWorld.java
View File

@@ -37,13 +37,7 @@ public class ConditionInWorld extends Condition<String> {
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