From 794121b20e727dba9e81f11f989a0a8202585c8f Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 4 Jul 2021 13:15:27 +0200
Subject: [PATCH] Migrated changes from master

---
 .../src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java   | 1 +
 .../main/java/com/willfp/ecoarmor/conditions/Condition.java | 6 +++---
 .../com/willfp/ecoarmor/effects/util/EffectWatcher.java     | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java
index a3893b7..b8a513c 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java
@@ -96,6 +96,7 @@ public class EcoArmorPlugin extends EcoPlugin {
     public void onReload() {
         Effects.values().forEach(effect -> this.getEventManager().unregisterListener(effect));
         Effects.values().stream().filter(Effect::isEnabled).forEach(effect -> this.getEventManager().registerListener(effect));
+        this.getLogger().info(Tiers.values().size() + " Tiers Loaded");
         this.getLogger().info(ArmorSets.values().size() + " Sets Loaded");
     }
 
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
index 570e146..47a722d 100644
--- 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
@@ -80,19 +80,19 @@ public abstract class Condition<T> implements Listener {
                 }
 
                 set.getPotionEffects().forEach((potionEffectType, integer) -> {
-                    player.addPotionEffect(new PotionEffect(potionEffectType, 0x6fffffff, integer - 1, false, false, true));
+                    player.addPotionEffect(new PotionEffect(potionEffectType, 0x6ffffff, integer - 1, false, false, true));
                 });
 
                 if (ArmorUtils.isWearingAdvanced(player)) {
                     set.getAdvancedPotionEffects().forEach((potionEffectType, integer) -> {
-                        player.addPotionEffect(new PotionEffect(potionEffectType, 0x6fffffff, integer - 1, false, false, true));
+                        player.addPotionEffect(new PotionEffect(potionEffectType, 0x6ffffff, integer - 1, false, false, true));
                     });
                 }
             } else {
                 set.getEffects().keySet().forEach(effect -> effect.disable(player));
 
                 for (PotionEffect effect : player.getActivePotionEffects()) {
-                    if (effect.getDuration() >= 500000000) {
+                    if (effect.getDuration() >= 0x5ffffff && effect.getDuration() <= 0x6ffffff) {
                         player.removePotionEffect(effect.getType());
                     }
                 }
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 21b67cb..0a20dcb 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
@@ -71,18 +71,18 @@ public class EffectWatcher extends PluginDependent implements Listener {
 
             if (set == null || !conditionsMet) {
                 for (PotionEffect effect : player.getActivePotionEffects()) {
-                    if (effect.getDuration() >= 500000000) {
+                    if (effect.getDuration() >= 0x5ffffff && effect.getDuration() <= 0x6ffffff) {
                         player.removePotionEffect(effect.getType());
                     }
                 }
             } else {
                 set.getPotionEffects().forEach((potionEffectType, integer) -> {
-                    player.addPotionEffect(new PotionEffect(potionEffectType, 0x6fffffff, integer - 1, false, false, true));
+                    player.addPotionEffect(new PotionEffect(potionEffectType, 0x6ffffff, integer - 1, false, false, true));
                 });
 
                 if (ArmorUtils.isWearingAdvanced(player)) {
                     set.getAdvancedPotionEffects().forEach((potionEffectType, integer) -> {
-                        player.addPotionEffect(new PotionEffect(potionEffectType, 0x6fffffff, integer - 1, false, false, true));
+                        player.addPotionEffect(new PotionEffect(potionEffectType, 0x6ffffff, integer - 1, false, false, true));
                     });
                 }
             }