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

Moved condition effect changes off to next tick

Browse Source
This commit is contained in:
Auxilor
2021-02-21 11:55:28 +00:00
parent c26798e572
commit b1f370cddc
8 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.jetbrains.annotations.NotNull;
@@ -15,7 +16,10 @@ public class ConditionAboveHealthPercent extends Condition<Double> {
super("above-health-percent", Double.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final EntityRegainHealthEvent event) {
if (!(event.getEntity() instanceof Player)) {
return;
@@ -35,14 +39,19 @@ public class ConditionAboveHealthPercent 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));
}
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);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final EntityDamageEvent event) {
if (!(event.getEntity() instanceof Player)) {
return;
@@ -62,11 +71,13 @@ public class ConditionAboveHealthPercent 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));
}
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);
}
@Override

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

@@ -5,6 +5,7 @@ import com.willfp.ecoarmor.sets.ArmorSet;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +14,10 @@ public class ConditionAboveXPLevel extends Condition<Integer> {
super("above-xp-level", Integer.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerExpChangeEvent event) {
Player player = event.getPlayer();
@@ -29,11 +33,13 @@ public class ConditionAboveXPLevel extends Condition<Integer> {
return;
}
if (isMet(player, value)) {
set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
} else {
set.getEffects().keySet().forEach(effect -> effect.disable(player));
}
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);
}
@Override

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

@@ -5,6 +5,7 @@ import com.willfp.ecoarmor.sets.ArmorSet;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +14,10 @@ public class ConditionAboveY extends Condition<Double> {
super("above-y", Double.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerMoveEvent event) {
Player player = event.getPlayer();
@@ -29,11 +33,13 @@ public class ConditionAboveY 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));
}
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);
}
@Override

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

@@ -6,6 +6,7 @@ import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.jetbrains.annotations.NotNull;
@@ -15,7 +16,10 @@ public class ConditionBelowHealthPercent extends Condition<Double> {
super("below-health-percent", Double.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final EntityRegainHealthEvent event) {
if (!(event.getEntity() instanceof Player)) {
return;
@@ -35,14 +39,19 @@ 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));
}
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);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final EntityDamageEvent event) {
if (!(event.getEntity() instanceof Player)) {
return;

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

@@ -5,6 +5,7 @@ import com.willfp.ecoarmor.sets.ArmorSet;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +14,10 @@ public class ConditionBelowXPLevel extends Condition<Integer> {
super("below-xp-level", Integer.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerExpChangeEvent event) {
Player player = event.getPlayer();
@@ -29,11 +33,13 @@ public class ConditionBelowXPLevel extends Condition<Integer> {
return;
}
if (isMet(player, value)) {
set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
} else {
set.getEffects().keySet().forEach(effect -> effect.disable(player));
}
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);
}
@Override

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

@@ -5,6 +5,7 @@ import com.willfp.ecoarmor.sets.ArmorSet;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +14,10 @@ public class ConditionBelowY extends Condition<Double> {
super("below-y", Double.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerMoveEvent event) {
Player player = event.getPlayer();
@@ -29,11 +33,13 @@ public class ConditionBelowY 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));
}
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);
}
@Override

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

@@ -6,6 +6,7 @@ import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;
import org.jetbrains.annotations.NotNull;
@@ -14,7 +15,10 @@ public class ConditionInWater extends Condition<Boolean> {
super("in-water", Boolean.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerMoveEvent event) {
Player player = event.getPlayer();
@@ -30,11 +34,13 @@ public class ConditionInWater extends Condition<Boolean> {
return;
}
if (isMet(player, value)) {
set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
} else {
set.getEffects().keySet().forEach(effect -> effect.disable(player));
}
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);
}
@Override

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

@@ -6,6 +6,7 @@ import com.willfp.ecoarmor.sets.util.ArmorUtils;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;
import org.jetbrains.annotations.NotNull;
@@ -17,7 +18,10 @@ public class ConditionInWorld extends Condition<String> {
super("in-world", String.class);
}
@EventHandler
@EventHandler(
priority = EventPriority.MONITOR,
ignoreCancelled = true
)
public void listener(@NotNull final PlayerMoveEvent event) {
Player player = event.getPlayer();
@@ -33,11 +37,13 @@ public class ConditionInWorld extends Condition<String> {
return;
}
if (isMet(player, value)) {
set.getEffects().keySet().forEach(effect -> effect.enable(player, value));
} else {
set.getEffects().keySet().forEach(effect -> effect.disable(player));
}
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);
}
@Override